[adm5120] add experimental support for 2.6.30
[openwrt-10.03/.git] / target / linux / adm5120 / patches-2.6.30 / 802-adm5120-switch-remove-redundant-napi-functions.patch
1 --- a/drivers/net/adm5120sw.c
2 +++ b/drivers/net/adm5120sw.c
3 @@ -517,7 +517,7 @@ static int adm5120_if_poll(struct napi_s
4         status = sw_int_status() & SWITCH_INTS_POLL;
5         if ((done < limit) && (!status)) {
6                 SW_DBG("disable polling mode for %s\n", dev->name);
7 -               netif_rx_complete(dev, napi);
8 +               napi_complete(napi);
9                 sw_int_unmask(SWITCH_INTS_POLL);
10                 return 0;
11         }
12 @@ -548,7 +548,7 @@ static irqreturn_t adm5120_switch_irq(in
13                 sw_dump_intr_mask("poll ints", status);
14                 SW_DBG("enable polling mode for %s\n", dev->name);
15                 sw_int_mask(SWITCH_INTS_POLL);
16 -               netif_rx_schedule(dev, &priv->napi);
17 +               napi_schedule(&priv->napi);
18         }
19  #else
20         sw_int_ack(status);