Merge branch 'master' of /repos/git/net-next-2.6

Conflicts:
	Documentation/feature-removal-schedule.txt
	net/ipv6/netfilter/ip6t_REJECT.c
	net/netfilter/xt_limit.c

Signed-off-by: Patrick McHardy <kaber@trash.net>

1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 2eb7f8a0d926..f155928bf14e 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -79,6 +79,7 @@
 #include <linux/tcp.h>
 #include <linux/uaccess.h>
 #include <linux/io.h>
+#include <linux/slab.h>
 #include <net/tcp.h>
 
 #include <asm/system.h>
@@ -2399,7 +2400,7 @@ static struct sk_buff *s2io_txdl_getskb(struct fifo_info *fifo_data,
                 return NULL;
         }
         pci_unmap_single(nic->pdev, (dma_addr_t)txds->Buffer_Pointer,
-                         skb->len - skb->data_len, PCI_DMA_TODEVICE);
+                         skb_headlen(skb), PCI_DMA_TODEVICE);
         frg_cnt = skb_shinfo(skb)->nr_frags;
         if (frg_cnt) {
                 txds++;
@@ -4201,7 +4202,7 @@ static netdev_tx_t s2io_xmit(struct sk_buff *skb, struct net_device *dev)
                 txdp->Control_2 |= TXD_VLAN_TAG(vlan_tag);
         }
 
-        frg_len = skb->len - skb->data_len;
+        frg_len = skb_headlen(skb);
         if (offload_type == SKB_GSO_UDP) {
                 int ufo_size;
 
@@ -4964,7 +4965,7 @@ static struct net_device_stats *s2io_get_stats(struct net_device *dev)
 static void s2io_set_multicast(struct net_device *dev)
 {
         int i, j, prev_cnt;
-        struct dev_mc_list *mclist;
+        struct netdev_hw_addr *ha;
         struct s2io_nic *sp = netdev_priv(dev);
         struct XENA_dev_config __iomem *bar0 = sp->bar0;
         u64 val64 = 0, multi_mac = 0x010203040506ULL, mask =
@@ -5093,12 +5094,12 @@ static void s2io_set_multicast(struct net_device *dev)
 
                 /* Create the new Rx filter list and update the same in H/W. */
                 i = 0;
-                netdev_for_each_mc_addr(mclist, dev) {
-                        memcpy(sp->usr_addrs[i].addr, mclist->dmi_addr,
+                netdev_for_each_mc_addr(ha, dev) {
+                        memcpy(sp->usr_addrs[i].addr, ha->addr,
                                ETH_ALEN);
                         mac_addr = 0;
                         for (j = 0; j < ETH_ALEN; j++) {
-                                mac_addr |= mclist->dmi_addr[j];
+                                mac_addr |= ha->addr[j];
                                 mac_addr <<= 8;
                         }
                         mac_addr >>= 8;