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: (1232 commits)
  iucv: Fix bad merging.
  net_sched: Add size table for qdiscs
  net_sched: Add accessor function for packet length for qdiscs
  net_sched: Add qdisc_enqueue wrapper
  highmem: Export totalhigh_pages.
  ipv6 mcast: Omit redundant address family checks in ip6_mc_source().
  net: Use standard structures for generic socket address structures.
  ipv6 netns: Make several "global" sysctl variables namespace aware.
  netns: Use net_eq() to compare net-namespaces for optimization.
  ipv6: remove unused macros from net/ipv6.h
  ipv6: remove unused parameter from ip6_ra_control
  tcp: fix kernel panic with listening_get_next
  tcp: Remove redundant checks when setting eff_sacks
  tcp: options clean up
  tcp: Fix MD5 signatures for non-linear skbs
  sctp: Update sctp global memory limit allocations.
  sctp: remove unnecessary byteshifting, calculate directly in big-endian
  sctp: Allow only 1 listening socket with SO_REUSEADDR
  sctp: Do not leak memory on multiple listen() calls
  sctp: Support ipv6only AF_INET6 sockets.
  ...

4 files changed, 53 insertions, 67 deletions

diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 95743e2682fe..b694d430f10e 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -3886,9 +3886,8 @@ static bool rx_get_frame(MGSLPC_INFO *info)
                 framesize = 0;
 #if SYNCLINK_GENERIC_HDLC
                 {
-                        struct net_device_stats *stats = hdlc_stats(info->netdev);
-                        stats->rx_errors++;
-                        stats->rx_frame_errors++;
+                        info->netdev->stats.rx_errors++;
+                        info->netdev->stats.rx_frame_errors++;
                 }
 #endif
         } else
@@ -4144,7 +4143,6 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
 static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         MGSLPC_INFO *info = dev_to_port(dev);
-        struct net_device_stats *stats = hdlc_stats(dev);
         unsigned long flags;
 
         if (debug_level >= DEBUG_LEVEL_INFO)
@@ -4159,8 +4157,8 @@ static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev)
         info->tx_put = info->tx_count = skb->len;
 
         /* update network statistics */
-        stats->tx_packets++;
-        stats->tx_bytes += skb->len;
+        dev->stats.tx_packets++;
+        dev->stats.tx_bytes += skb->len;
 
         /* done with socket buffer, so free it */
         dev_kfree_skb(skb);
@@ -4376,14 +4374,13 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 static void hdlcdev_tx_timeout(struct net_device *dev)
 {
         MGSLPC_INFO *info = dev_to_port(dev);
-        struct net_device_stats *stats = hdlc_stats(dev);
         unsigned long flags;
 
         if (debug_level >= DEBUG_LEVEL_INFO)
                 printk("hdlcdev_tx_timeout(%s)\n",dev->name);
 
-        stats->tx_errors++;
-        stats->tx_aborted_errors++;
+        dev->stats.tx_errors++;
+        dev->stats.tx_aborted_errors++;
 
         spin_lock_irqsave(&info->lock,flags);
         tx_stop(info);
@@ -4416,27 +4413,26 @@ static void hdlcdev_rx(MGSLPC_INFO *info, char *buf, int size)
 {
         struct sk_buff *skb = dev_alloc_skb(size);
         struct net_device *dev = info->netdev;
-        struct net_device_stats *stats = hdlc_stats(dev);
 
         if (debug_level >= DEBUG_LEVEL_INFO)
                 printk("hdlcdev_rx(%s)\n",dev->name);
 
         if (skb == NULL) {
                 printk(KERN_NOTICE "%s: can't alloc skb, dropping packet\n", dev->name);
-                stats->rx_dropped++;
+                dev->stats.rx_dropped++;
                 return;
         }
 
-        memcpy(skb_put(skb, size),buf,size);
+        memcpy(skb_put(skb, size), buf, size);
 
-        skb->protocol = hdlc_type_trans(skb, info->netdev);
+        skb->protocol = hdlc_type_trans(skb, dev);
 
-        stats->rx_packets++;
-        stats->rx_bytes += size;
+        dev->stats.rx_packets++;
+        dev->stats.rx_bytes += size;
 
         netif_rx(skb);
 
-        info->netdev->last_rx = jiffies;
+        dev->last_rx = jiffies;
 }
 
 /**
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
index 9f14753fada1..527d220aa4aa 100644
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
@@ -6631,9 +6631,8 @@ static bool mgsl_get_rx_frame(struct mgsl_struct *info)
                 framesize = 0;
 #if SYNCLINK_GENERIC_HDLC
                 {
-                        struct net_device_stats *stats = hdlc_stats(info->netdev);
-                        stats->rx_errors++;
-                        stats->rx_frame_errors++;
+                        info->netdev->stats.rx_errors++;
+                        info->netdev->stats.rx_frame_errors++;
                 }
 #endif
         } else
@@ -7744,7 +7743,6 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
 static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct mgsl_struct *info = dev_to_port(dev);
-        struct net_device_stats *stats = hdlc_stats(dev);
         unsigned long flags;
 
         if (debug_level >= DEBUG_LEVEL_INFO)
@@ -7758,8 +7756,8 @@ static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev)
         mgsl_load_tx_dma_buffer(info, skb->data, skb->len);
 
         /* update network statistics */
-        stats->tx_packets++;
-        stats->tx_bytes += skb->len;
+        dev->stats.tx_packets++;
+        dev->stats.tx_bytes += skb->len;
 
         /* done with socket buffer, so free it */
         dev_kfree_skb(skb);
@@ -7975,14 +7973,13 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 static void hdlcdev_tx_timeout(struct net_device *dev)
 {
         struct mgsl_struct *info = dev_to_port(dev);
-        struct net_device_stats *stats = hdlc_stats(dev);
         unsigned long flags;
 
         if (debug_level >= DEBUG_LEVEL_INFO)
                 printk("hdlcdev_tx_timeout(%s)\n",dev->name);
 
-        stats->tx_errors++;
-        stats->tx_aborted_errors++;
+        dev->stats.tx_errors++;
+        dev->stats.tx_aborted_errors++;
 
         spin_lock_irqsave(&info->irq_spinlock,flags);
         usc_stop_transmitter(info);
@@ -8015,27 +8012,27 @@ static void hdlcdev_rx(struct mgsl_struct *info, char *buf, int size)
 {
         struct sk_buff *skb = dev_alloc_skb(size);
         struct net_device *dev = info->netdev;
-        struct net_device_stats *stats = hdlc_stats(dev);
 
         if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("hdlcdev_rx(%s)\n",dev->name);
+                printk("hdlcdev_rx(%s)\n", dev->name);
 
         if (skb == NULL) {
-                printk(KERN_NOTICE "%s: can't alloc skb, dropping packet\n", dev->name);
-                stats->rx_dropped++;
+                printk(KERN_NOTICE "%s: can't alloc skb, dropping packet\n",
+                       dev->name);
+                dev->stats.rx_dropped++;
                 return;
         }
 
-        memcpy(skb_put(skb, size),buf,size);
+        memcpy(skb_put(skb, size), buf, size);
 
-        skb->protocol = hdlc_type_trans(skb, info->netdev);
+        skb->protocol = hdlc_type_trans(skb, dev);
 
-        stats->rx_packets++;
-        stats->rx_bytes += size;
+        dev->stats.rx_packets++;
+        dev->stats.rx_bytes += size;
 
         netif_rx(skb);
 
-        info->netdev->last_rx = jiffies;
+        dev->last_rx = jiffies;
 }
 
 /**
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c
index 07aa42a7f397..2c3e43bb2cc9 100644
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
@@ -1536,7 +1536,6 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
 static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct slgt_info *info = dev_to_port(dev);
-        struct net_device_stats *stats = hdlc_stats(dev);
         unsigned long flags;
 
         DBGINFO(("%s hdlc_xmit\n", dev->name));
@@ -1549,8 +1548,8 @@ static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev)
         tx_load(info, skb->data, skb->len);
 
         /* update network statistics */
-        stats->tx_packets++;
-        stats->tx_bytes += skb->len;
+        dev->stats.tx_packets++;
+        dev->stats.tx_bytes += skb->len;
 
         /* done with socket buffer, so free it */
         dev_kfree_skb(skb);
@@ -1767,13 +1766,12 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 static void hdlcdev_tx_timeout(struct net_device *dev)
 {
         struct slgt_info *info = dev_to_port(dev);
-        struct net_device_stats *stats = hdlc_stats(dev);
         unsigned long flags;
 
         DBGINFO(("%s hdlcdev_tx_timeout\n", dev->name));
 
-        stats->tx_errors++;
-        stats->tx_aborted_errors++;
+        dev->stats.tx_errors++;
+        dev->stats.tx_aborted_errors++;
 
         spin_lock_irqsave(&info->lock,flags);
         tx_stop(info);
@@ -1806,26 +1804,25 @@ static void hdlcdev_rx(struct slgt_info *info, char *buf, int size)
 {
         struct sk_buff *skb = dev_alloc_skb(size);
         struct net_device *dev = info->netdev;
-        struct net_device_stats *stats = hdlc_stats(dev);
 
         DBGINFO(("%s hdlcdev_rx\n", dev->name));
 
         if (skb == NULL) {
                 DBGERR(("%s: can't alloc skb, drop packet\n", dev->name));
-                stats->rx_dropped++;
+                dev->stats.rx_dropped++;
                 return;
         }
 
-        memcpy(skb_put(skb, size),buf,size);
+        memcpy(skb_put(skb, size), buf, size);
 
-        skb->protocol = hdlc_type_trans(skb, info->netdev);
+        skb->protocol = hdlc_type_trans(skb, dev);
 
-        stats->rx_packets++;
-        stats->rx_bytes += size;
+        dev->stats.rx_packets++;
+        dev->stats.rx_bytes += size;
 
         netif_rx(skb);
 
-        info->netdev->last_rx = jiffies;
+        dev->last_rx = jiffies;
 }
 
 /**
@@ -4568,9 +4565,8 @@ check_again:
 
 #if SYNCLINK_GENERIC_HDLC
         if (framesize == 0) {
-                struct net_device_stats *stats = hdlc_stats(info->netdev);
-                stats->rx_errors++;
-                stats->rx_frame_errors++;
+                info->netdev->stats.rx_errors++;
+                info->netdev->stats.rx_frame_errors++;
         }
 #endif
 
diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c
index c4bc09018368..5768c4136342 100644
--- a/drivers/char/synclinkmp.c
+++ b/drivers/char/synclinkmp.c
@@ -1672,7 +1672,6 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
 static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         SLMP_INFO *info = dev_to_port(dev);
-        struct net_device_stats *stats = hdlc_stats(dev);
         unsigned long flags;
 
         if (debug_level >= DEBUG_LEVEL_INFO)
@@ -1686,8 +1685,8 @@ static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev)
         tx_load_dma_buffer(info, skb->data, skb->len);
 
         /* update network statistics */
-        stats->tx_packets++;
-        stats->tx_bytes += skb->len;
+        dev->stats.tx_packets++;
+        dev->stats.tx_bytes += skb->len;
 
         /* done with socket buffer, so free it */
         dev_kfree_skb(skb);
@@ -1903,14 +1902,13 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 static void hdlcdev_tx_timeout(struct net_device *dev)
 {
         SLMP_INFO *info = dev_to_port(dev);
-        struct net_device_stats *stats = hdlc_stats(dev);
         unsigned long flags;
 
         if (debug_level >= DEBUG_LEVEL_INFO)
                 printk("hdlcdev_tx_timeout(%s)\n",dev->name);
 
-        stats->tx_errors++;
-        stats->tx_aborted_errors++;
+        dev->stats.tx_errors++;
+        dev->stats.tx_aborted_errors++;
 
         spin_lock_irqsave(&info->lock,flags);
         tx_stop(info);
@@ -1943,27 +1941,27 @@ static void hdlcdev_rx(SLMP_INFO *info, char *buf, int size)
 {
         struct sk_buff *skb = dev_alloc_skb(size);
         struct net_device *dev = info->netdev;
-        struct net_device_stats *stats = hdlc_stats(dev);
 
         if (debug_level >= DEBUG_LEVEL_INFO)
                 printk("hdlcdev_rx(%s)\n",dev->name);
 
         if (skb == NULL) {
-                printk(KERN_NOTICE "%s: can't alloc skb, dropping packet\n", dev->name);
-                stats->rx_dropped++;
+                printk(KERN_NOTICE "%s: can't alloc skb, dropping packet\n",
+                       dev->name);
+                dev->stats.rx_dropped++;
                 return;
         }
 
-        memcpy(skb_put(skb, size),buf,size);
+        memcpy(skb_put(skb, size), buf, size);
 
-        skb->protocol = hdlc_type_trans(skb, info->netdev);
+        skb->protocol = hdlc_type_trans(skb, dev);
 
-        stats->rx_packets++;
-        stats->rx_bytes += size;
+        dev->stats.rx_packets++;
+        dev->stats.rx_bytes += size;
 
         netif_rx(skb);
 
-        info->netdev->last_rx = jiffies;
+        dev->last_rx = jiffies;
 }
 
 /**
@@ -4976,9 +4974,8 @@ CheckAgain:
                 framesize = 0;
 #if SYNCLINK_GENERIC_HDLC
                 {
-                        struct net_device_stats *stats = hdlc_stats(info->netdev);
-                        stats->rx_errors++;
-                        stats->rx_frame_errors++;
+                        info->netdev->stats.rx_errors++;
+                        info->netdev->stats.rx_frame_errors++;
                 }
 #endif
         }