Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  wireless: remove duplicated .ndo_set_mac_address
  netfilter: xtables: fix IPv6 dependency in the cluster match
  tg3: Add GRO support.
  niu: Add GRO support.
  ucc_geth: Fix use-after-of_node_put() in ucc_geth_probe().
  gianfar: Fix use-after-of_node_put() in gfar_of_init().
  kernel: remove HIPQUAD()
  netpoll: store local and remote ip in net-endian
  netfilter: fix endian bug in conntrack printks
  dmascc: fix incomplete conversion to network_device_ops
  gso: Fix support for linear packets
  skbuff.h: fix missing kernel-doc
  ni5010: convert to net_device_ops

11 files changed, 33 insertions, 31 deletions

diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 6a38800be3f1..65f55877be95 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -289,9 +289,9 @@ static int gfar_of_init(struct net_device *dev)
                 id = of_get_property(phy, "reg", NULL);
 
                 of_node_put(phy);
-                of_node_put(mdio);
 
                 fsl_pq_mdio_bus_name(bus_name, mdio);
+                of_node_put(mdio);
                 snprintf(priv->phy_bus_id, sizeof(priv->phy_bus_id), "%s:%02x",
                                 bus_name, *id);
         }
diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c
index 881bf818bb48..7459b3ac77a9 100644
--- a/drivers/net/hamradio/dmascc.c
+++ b/drivers/net/hamradio/dmascc.c
@@ -445,6 +445,7 @@ static const struct net_device_ops scc_netdev_ops = {
         .ndo_stop = scc_close,
         .ndo_start_xmit = scc_send_packet,
         .ndo_do_ioctl = scc_ioctl,
+        .ndo_set_mac_address = scc_set_mac_address,
 };
 
 static int __init setup_adapter(int card_base, int type, int n)
@@ -584,7 +585,6 @@ static int __init setup_adapter(int card_base, int type, int n)
                 dev->irq = irq;
                 dev->netdev_ops = &scc_netdev_ops;
                 dev->header_ops = &ax25_header_ops;
-                dev->set_mac_address = scc_set_mac_address;
         }
         if (register_netdev(info->dev[0])) {
                 printk(KERN_ERR "dmascc: could not register %s\n",
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index d304d38cd5d1..eceadf787a67 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -294,14 +294,12 @@ static ssize_t show_remote_port(struct netconsole_target *nt, char *buf)
 
 static ssize_t show_local_ip(struct netconsole_target *nt, char *buf)
 {
-        return snprintf(buf, PAGE_SIZE, "%d.%d.%d.%d\n",
-                        HIPQUAD(nt->np.local_ip));
+        return snprintf(buf, PAGE_SIZE, "%pI4\n", &nt->np.local_ip);
 }
 
 static ssize_t show_remote_ip(struct netconsole_target *nt, char *buf)
 {
-        return snprintf(buf, PAGE_SIZE, "%d.%d.%d.%d\n",
-                        HIPQUAD(nt->np.remote_ip));
+        return snprintf(buf, PAGE_SIZE, "%pI4\n", &nt->np.remote_ip);
 }
 
 static ssize_t show_local_mac(struct netconsole_target *nt, char *buf)
@@ -438,7 +436,7 @@ static ssize_t store_local_ip(struct netconsole_target *nt,
                 return -EINVAL;
         }
 
-        nt->np.local_ip = ntohl(in_aton(buf));
+        nt->np.local_ip = in_aton(buf);
 
         return strnlen(buf, count);
 }
@@ -454,7 +452,7 @@ static ssize_t store_remote_ip(struct netconsole_target *nt,
                 return -EINVAL;
         }
 
-        nt->np.remote_ip = ntohl(in_aton(buf));
+        nt->np.remote_ip = in_aton(buf);
 
         return strnlen(buf, count);
 }
diff --git a/drivers/net/ni5010.c b/drivers/net/ni5010.c
index 539e18ab485c..2a8da476ab3d 100644
--- a/drivers/net/ni5010.c
+++ b/drivers/net/ni5010.c
@@ -189,6 +189,17 @@ static void __init trigger_irq(int ioaddr)
                 outb(MM_EN_XMT|MM_MUX, IE_MMODE); /* Start transmission */
 }
 
+static const struct net_device_ops ni5010_netdev_ops = {
+        .ndo_open               = ni5010_open,
+        .ndo_stop               = ni5010_close,
+        .ndo_start_xmit         = ni5010_send_packet,
+        .ndo_set_multicast_list = ni5010_set_multicast_list,
+        .ndo_tx_timeout         = ni5010_timeout,
+        .ndo_validate_addr      = eth_validate_addr,
+        .ndo_set_mac_address    = eth_mac_addr,
+        .ndo_change_mtu         = eth_change_mtu,
+};
+
 /*
  *      This is the real probe routine.  Linux has a history of friendly device
  *      probes on the ISA bus.  A good device probes avoids doing writes, and
@@ -328,13 +339,8 @@ static int __init ni5010_probe1(struct net_device *dev, int ioaddr)
                 outb(0, IE_RBUF);       /* set buffer byte 0 to 0 again */
         }
         printk("-> bufsize rcv/xmt=%d/%d\n", bufsize_rcv, NI5010_BUFSIZE);
-        memset(netdev_priv(dev), 0, sizeof(struct ni5010_local));
 
-        dev->open               = ni5010_open;
-        dev->stop               = ni5010_close;
-        dev->hard_start_xmit    = ni5010_send_packet;
-        dev->set_multicast_list = ni5010_set_multicast_list;
-        dev->tx_timeout         = ni5010_timeout;
+        dev->netdev_ops         = &ni5010_netdev_ops;
         dev->watchdog_timeo     = HZ/20;
 
         dev->flags &= ~IFF_MULTICAST;   /* Multicast doesn't work */
diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index 50c11126a3db..02c37e2f08a9 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -3441,7 +3441,8 @@ static int niu_rx_pkt_ignore(struct niu *np, struct rx_ring_info *rp)
         return num_rcr;
 }
 
-static int niu_process_rx_pkt(struct niu *np, struct rx_ring_info *rp)
+static int niu_process_rx_pkt(struct napi_struct *napi, struct niu *np,
+                              struct rx_ring_info *rp)
 {
         unsigned int index = rp->rcr_index;
         struct sk_buff *skb;
@@ -3518,7 +3519,7 @@ static int niu_process_rx_pkt(struct niu *np, struct rx_ring_info *rp)
 
         skb->protocol = eth_type_trans(skb, np->dev);
         skb_record_rx_queue(skb, rp->rx_channel);
-        netif_receive_skb(skb);
+        napi_gro_receive(napi, skb);
 
         return num_rcr;
 }
@@ -3706,7 +3707,8 @@ static inline void niu_sync_rx_discard_stats(struct niu *np,
         }
 }
 
-static int niu_rx_work(struct niu *np, struct rx_ring_info *rp, int budget)
+static int niu_rx_work(struct napi_struct *napi, struct niu *np,
+                       struct rx_ring_info *rp, int budget)
 {
         int qlen, rcr_done = 0, work_done = 0;
         struct rxdma_mailbox *mbox = rp->mbox;
@@ -3728,7 +3730,7 @@ static int niu_rx_work(struct niu *np, struct rx_ring_info *rp, int budget)
         rcr_done = work_done = 0;
         qlen = min(qlen, budget);
         while (work_done < qlen) {
-                rcr_done += niu_process_rx_pkt(np, rp);
+                rcr_done += niu_process_rx_pkt(napi, np, rp);
                 work_done++;
         }
 
@@ -3776,7 +3778,7 @@ static int niu_poll_core(struct niu *np, struct niu_ldg *lp, int budget)
                 if (rx_vec & (1 << rp->rx_channel)) {
                         int this_work_done;
 
-                        this_work_done = niu_rx_work(np, rp,
+                        this_work_done = niu_rx_work(&lp->napi, np, rp,
                                                      budget);
 
                         budget -= this_work_done;
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index f7efcecc4108..1205c2a22657 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -4392,7 +4392,7 @@ static void tg3_recycle_rx(struct tg3 *tp, u32 opaque_key,
 #if TG3_VLAN_TAG_USED
 static int tg3_vlan_rx(struct tg3 *tp, struct sk_buff *skb, u16 vlan_tag)
 {
-        return vlan_hwaccel_receive_skb(skb, tp->vlgrp, vlan_tag);
+        return vlan_gro_receive(&tp->napi, tp->vlgrp, vlan_tag, skb);
 }
 #endif
 
@@ -4539,7 +4539,7 @@ static int tg3_rx(struct tg3 *tp, int budget)
                                     desc->err_vlan & RXD_VLAN_MASK);
                 } else
 #endif
-                        netif_receive_skb(skb);
+                        napi_gro_receive(&tp->napi, skb);
 
                 received++;
                 budget--;
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 86a479f61c0c..933fcfbf35e1 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -3648,15 +3648,16 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
                 mdio = of_get_parent(phy);
 
                 if (mdio == NULL)
-                        return -1;
+                        return -ENODEV;
 
                 err = of_address_to_resource(mdio, 0, &res);
-                of_node_put(mdio);
-
-                if (err)
-                        return -1;
 
+                if (err) {
+                        of_node_put(mdio);
+                        return err;
+                }
                 fsl_pq_mdio_bus_name(bus_name, mdio);
+                of_node_put(mdio);
                 snprintf(ug_info->phy_bus_id, sizeof(ug_info->phy_bus_id),
                         "%s:%02x", bus_name, *prop);
         }
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 31b1cc2b778a..f21a6171c691 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -2752,7 +2752,6 @@ static const struct net_device_ops airo_netdev_ops = {
         .ndo_set_mac_address    = airo_set_mac_address,
         .ndo_do_ioctl           = airo_ioctl,
         .ndo_change_mtu         = airo_change_mtu,
-        .ndo_set_mac_address    = eth_mac_addr,
         .ndo_validate_addr      = eth_validate_addr,
 };
 
@@ -2765,7 +2764,6 @@ static const struct net_device_ops mpi_netdev_ops = {
         .ndo_set_mac_address    = airo_set_mac_address,
         .ndo_do_ioctl           = airo_ioctl,
         .ndo_change_mtu         = airo_change_mtu,
-        .ndo_set_mac_address    = eth_mac_addr,
         .ndo_validate_addr      = eth_validate_addr,
 };
 
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index b3449948a25a..4a92af1d7877 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -11593,7 +11593,6 @@ static const struct net_device_ops ipw_netdev_ops = {
         .ndo_set_mac_address    = ipw_net_set_mac_address,
         .ndo_start_xmit         = ieee80211_xmit,
         .ndo_change_mtu         = ieee80211_change_mtu,
-        .ndo_set_mac_address    = eth_mac_addr,
         .ndo_validate_addr      = eth_validate_addr,
 };
 
diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c
index 166ed9584601..e26d7b3ceab5 100644
--- a/drivers/net/wireless/prism54/islpci_dev.c
+++ b/drivers/net/wireless/prism54/islpci_dev.c
@@ -803,7 +803,6 @@ static const struct net_device_ops islpci_netdev_ops = {
         .ndo_tx_timeout         = islpci_eth_tx_timeout,
         .ndo_set_mac_address    = prism54_set_mac_address,
         .ndo_change_mtu         = eth_change_mtu,
-        .ndo_set_mac_address    = eth_mac_addr,
         .ndo_validate_addr      = eth_validate_addr,
 };
 
diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c
index 9b244c96b221..5fabd9c0f07a 100644
--- a/drivers/net/wireless/zd1201.c
+++ b/drivers/net/wireless/zd1201.c
@@ -1725,7 +1725,6 @@ static const struct net_device_ops zd1201_netdev_ops = {
         .ndo_set_multicast_list = zd1201_set_multicast,
         .ndo_set_mac_address    = zd1201_set_mac_address,
         .ndo_change_mtu         = eth_change_mtu,
-        .ndo_set_mac_address    = eth_mac_addr,
         .ndo_validate_addr      = eth_validate_addr,
 };