36 files changed, 358 insertions, 245 deletions

diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
index 48e9cc0369b1..1f73d7f7e024 100644
--- a/drivers/isdn/i4l/isdn_net.c
+++ b/drivers/isdn/i4l/isdn_net.c
@@ -2532,6 +2532,9 @@ static void _isdn_setup(struct net_device *dev)
 
         /* Setup the generic properties */
         dev->flags = IFF_NOARP|IFF_POINTOPOINT;
+
+        /* isdn prepends a header in the tx path, can't share skbs */
+        dev->priv_flags &= ~IFF_TX_SKB_SHARING;
         dev->header_ops = NULL;
         dev->netdev_ops = &isdn_netdev_ops;
 
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index b7622c3745fa..e1eca2ab505e 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -282,6 +282,7 @@ obj-$(CONFIG_USB_HSO)		+= usb/
 obj-$(CONFIG_USB_USBNET)        += usb/
 obj-$(CONFIG_USB_ZD1201)        += usb/
 obj-$(CONFIG_USB_IPHETH)        += usb/
+obj-$(CONFIG_USB_CDC_PHONET)   += usb/
 
 obj-$(CONFIG_WLAN) += wireless/
 obj-$(CONFIG_NET_TULIP) += tulip/
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index 536038b22710..31798f5f5d06 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -1502,13 +1502,13 @@ static int __devinit ace_init(struct net_device *dev)
          * firmware to wipe the ring without re-initializing it.
          */
         if (!test_and_set_bit(0, &ap->std_refill_busy))
-                ace_load_std_rx_ring(ap, RX_RING_SIZE);
+                ace_load_std_rx_ring(dev, RX_RING_SIZE);
         else
                 printk(KERN_ERR "%s: Someone is busy refilling the RX ring\n",
                        ap->name);
         if (ap->version >= 2) {
                 if (!test_and_set_bit(0, &ap->mini_refill_busy))
-                        ace_load_mini_rx_ring(ap, RX_MINI_SIZE);
+                        ace_load_mini_rx_ring(dev, RX_MINI_SIZE);
                 else
                         printk(KERN_ERR "%s: Someone is busy refilling "
                                "the RX mini ring\n", ap->name);
@@ -1584,9 +1584,10 @@ static void ace_watchdog(struct net_device *data)
 }
 
 
-static void ace_tasklet(unsigned long dev)
+static void ace_tasklet(unsigned long arg)
 {
-        struct ace_private *ap = netdev_priv((struct net_device *)dev);
+        struct net_device *dev = (struct net_device *) arg;
+        struct ace_private *ap = netdev_priv(dev);
         int cur_size;
 
         cur_size = atomic_read(&ap->cur_rx_bufs);
@@ -1595,7 +1596,7 @@ static void ace_tasklet(unsigned long dev)
 #ifdef DEBUG
                 printk("refilling buffers (current %i)\n", cur_size);
 #endif
-                ace_load_std_rx_ring(ap, RX_RING_SIZE - cur_size);
+                ace_load_std_rx_ring(dev, RX_RING_SIZE - cur_size);
         }
 
         if (ap->version >= 2) {
@@ -1606,7 +1607,7 @@ static void ace_tasklet(unsigned long dev)
                         printk("refilling mini buffers (current %i)\n",
                                cur_size);
 #endif
-                        ace_load_mini_rx_ring(ap, RX_MINI_SIZE - cur_size);
+                        ace_load_mini_rx_ring(dev, RX_MINI_SIZE - cur_size);
                 }
         }
 
@@ -1616,7 +1617,7 @@ static void ace_tasklet(unsigned long dev)
 #ifdef DEBUG
                 printk("refilling jumbo buffers (current %i)\n", cur_size);
 #endif
-                ace_load_jumbo_rx_ring(ap, RX_JUMBO_SIZE - cur_size);
+                ace_load_jumbo_rx_ring(dev, RX_JUMBO_SIZE - cur_size);
         }
         ap->tasklet_pending = 0;
 }
@@ -1642,8 +1643,9 @@ static void ace_dump_trace(struct ace_private *ap)
  * done only before the device is enabled, thus no interrupts are
  * generated and by the interrupt handler/tasklet handler.
  */
-static void ace_load_std_rx_ring(struct ace_private *ap, int nr_bufs)
+static void ace_load_std_rx_ring(struct net_device *dev, int nr_bufs)
 {
+        struct ace_private *ap = netdev_priv(dev);
         struct ace_regs __iomem *regs = ap->regs;
         short i, idx;
 
@@ -1657,11 +1659,10 @@ static void ace_load_std_rx_ring(struct ace_private *ap, int nr_bufs)
                 struct rx_desc *rd;
                 dma_addr_t mapping;
 
-                skb = dev_alloc_skb(ACE_STD_BUFSIZE + NET_IP_ALIGN);
+                skb = netdev_alloc_skb_ip_align(dev, ACE_STD_BUFSIZE);
                 if (!skb)
                         break;
 
-                skb_reserve(skb, NET_IP_ALIGN);
                 mapping = pci_map_page(ap->pdev, virt_to_page(skb->data),
                                        offset_in_page(skb->data),
                                        ACE_STD_BUFSIZE,
@@ -1705,8 +1706,9 @@ static void ace_load_std_rx_ring(struct ace_private *ap, int nr_bufs)
 }
 
 
-static void ace_load_mini_rx_ring(struct ace_private *ap, int nr_bufs)
+static void ace_load_mini_rx_ring(struct net_device *dev, int nr_bufs)
 {
+        struct ace_private *ap = netdev_priv(dev);
         struct ace_regs __iomem *regs = ap->regs;
         short i, idx;
 
@@ -1718,11 +1720,10 @@ static void ace_load_mini_rx_ring(struct ace_private *ap, int nr_bufs)