Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 13 insertions, 20 deletions

diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c
index 7fa7a907f134..b05bad829827 100644
--- a/drivers/net/dl2k.c
+++ b/drivers/net/dl2k.c
@@ -163,8 +163,8 @@ rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent)
                             strcmp (media[card_idx], "4") == 0) {
                                 np->speed = 100;
                                 np->full_duplex = 1;
-                        } else if (strcmp (media[card_idx], "100mbps_hd") == 0
-                                   || strcmp (media[card_idx], "3") == 0) {
+                        } else if (strcmp (media[card_idx], "100mbps_hd") == 0 ||
+                                   strcmp (media[card_idx], "3") == 0) {
                                 np->speed = 100;
                                 np->full_duplex = 0;
                         } else if (strcmp (media[card_idx], "10mbps_fd") == 0 ||
@@ -411,7 +411,7 @@ rio_open (struct net_device *dev)
         int i;
         u16 macctrl;
 
-        i = request_irq (dev->irq, &rio_interrupt, IRQF_SHARED, dev->name, dev);
+        i = request_irq (dev->irq, rio_interrupt, IRQF_SHARED, dev->name, dev);
         if (i)
                 return i;
 
@@ -505,7 +505,8 @@ rio_timer (unsigned long data)
                         entry = np->old_rx % RX_RING_SIZE;
                         /* Dropped packets don't need to re-allocate */
                         if (np->rx_skbuff[entry] == NULL) {
-                                skb = netdev_alloc_skb (dev, np->rx_buf_sz);
+                                skb = netdev_alloc_skb_ip_align(dev,
+                                                                np->rx_buf_sz);
                                 if (skb == NULL) {
                                         np->rx_ring[entry].fraginfo = 0;
                                         printk (KERN_INFO
@@ -514,8 +515,6 @@ rio_timer (unsigned long data)
                                         break;
                                 }
                                 np->rx_skbuff[entry] = skb;
-                                /* 16 byte align the IP header */
-                                skb_reserve (skb, 2);
                                 np->rx_ring[entry].fraginfo =
                                     cpu_to_le64 (pci_map_single
                                          (np->pdev, skb->data, np->rx_buf_sz,
@@ -576,7 +575,9 @@ alloc_list (struct net_device *dev)
         /* Allocate the rx buffers */
         for (i = 0; i < RX_RING_SIZE; i++) {
                 /* Allocated fixed size of skbuff */
-                struct sk_buff *skb = netdev_alloc_skb (dev, np->rx_buf_sz);
+                struct sk_buff *skb;
+
+                skb = netdev_alloc_skb_ip_align(dev, np->rx_buf_sz);
                 np->rx_skbuff[i] = skb;
                 if (skb == NULL) {
                         printk (KERN_ERR
@@ -584,7 +585,6 @@ alloc_list (struct net_device *dev)
                                 dev->name);
                         break;
                 }
-                skb_reserve (skb, 2);   /* 16 byte align the IP header. */
                 /* Rubicon now supports 40 bits of addressing space. */
                 np->rx_ring[i].fraginfo =
                     cpu_to_le64 ( pci_map_single (
@@ -871,13 +871,11 @@ receive_packet (struct net_device *dev)
                                                   PCI_DMA_FROMDEVICE);
                                 skb_put (skb = np->rx_skbuff[entry], pkt_len);
                                 np->rx_skbuff[entry] = NULL;
-                        } else if ((skb = netdev_alloc_skb(dev, pkt_len + 2))) {
+                        } else if ((skb = netdev_alloc_skb_ip_align(dev, pkt_len))) {
                                 pci_dma_sync_single_for_cpu(np->pdev,
                                                             desc_to_dma(desc),
                                                             np->rx_buf_sz,
                                                             PCI_DMA_FROMDEVICE);
-                                /* 16 byte align the IP header */
-                                skb_reserve (skb, 2);
                                 skb_copy_to_linear_data (skb,
                                                   np->rx_skbuff[entry]->data,
                                                   pkt_len);
@@ -907,7 +905,7 @@ receive_packet (struct net_device *dev)
                 struct sk_buff *skb;
                 /* Dropped packets don't need to re-allocate */
                 if (np->rx_skbuff[entry] == NULL) {
-                        skb = netdev_alloc_skb(dev, np->rx_buf_sz);
+                        skb = netdev_alloc_skb_ip_align(dev, np->rx_buf_sz);
                         if (skb == NULL) {
                                 np->rx_ring[entry].fraginfo = 0;
                                 printk (KERN_INFO
@@ -917,8 +915,6 @@ receive_packet (struct net_device *dev)
                                 break;
                         }
                         np->rx_skbuff[entry] = skb;
-                        /* 16 byte align the IP header */
-                        skb_reserve (skb, 2);
                         np->rx_ring[entry].fraginfo =
                             cpu_to_le64 (pci_map_single
                                          (np->pdev, skb->data, np->rx_buf_sz,
@@ -1132,19 +1128,16 @@ set_multicast (struct net_device *dev)
                 /* Receive all frames promiscuously. */
                 rx_mode = ReceiveAllFrames;
         } else if ((dev->flags & IFF_ALLMULTI) ||
-                        (dev->mc_count > multicast_filter_limit)) {
+                        (netdev_mc_count(dev) > multicast_filter_limit)) {
                 /* Receive broadcast and multicast frames */
                 rx_mode = ReceiveBroadcast | ReceiveMulticast | ReceiveUnicast;
-        } else if (dev->mc_count > 0) {
-                int i;
+        } else if (!netdev_mc_empty(dev)) {
                 struct dev_mc_list *mclist;
                 /* Receive broadcast frames and multicast frames filtering
                    by Hashtable */
                 rx_mode =
                     ReceiveBroadcast | ReceiveMulticastHash | ReceiveUnicast;
-                for (i=0, mclist = dev->mc_list; mclist && i < dev->mc_count;
-                                i++, mclist=mclist->next)
-                {
+                netdev_for_each_mc_addr(mclist, dev) {
                         int bit, index = 0;
                         int crc = ether_crc_le (ETH_ALEN, mclist->dmi_addr);
                         /* The inverted high significant 6 bits of CRC are