Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	arch/sh/kernel/vmlinux.lds.S

2 files changed, 60 insertions, 44 deletions

diff --git a/drivers/usb/gadget/f_phonet.c b/drivers/usb/gadget/f_phonet.c
index 96fb118355b0..d2de10b9dc4b 100644
--- a/drivers/usb/gadget/f_phonet.c
+++ b/drivers/usb/gadget/f_phonet.c
@@ -35,6 +35,10 @@
 #include "u_phonet.h"
 
 #define PN_MEDIA_USB    0x1B
+#define MAXPACKET       512
+#if (PAGE_SIZE % MAXPACKET)
+#error MAXPACKET must divide PAGE_SIZE!
+#endif
 
 /*-------------------------------------------------------------------------*/
 
@@ -45,6 +49,10 @@ struct phonet_port {
 
 struct f_phonet {
         struct usb_function             function;
+        struct {
+                struct sk_buff          *skb;
+                spinlock_t              lock;
+        } rx;
         struct net_device               *dev;
         struct usb_ep                   *in_ep, *out_ep;
 
@@ -52,7 +60,7 @@ struct f_phonet {
         struct usb_request              *out_reqv[0];
 };
 
-static int phonet_rxq_size = 2;
+static int phonet_rxq_size = 17;
 
 static inline struct f_phonet *func_to_pn(struct usb_function *f)
 {
@@ -138,7 +146,7 @@ pn_hs_sink_desc = {
 
         .bEndpointAddress =     USB_DIR_OUT,
         .bmAttributes =         USB_ENDPOINT_XFER_BULK,
-        .wMaxPacketSize =       cpu_to_le16(512),
+        .wMaxPacketSize =       cpu_to_le16(MAXPACKET),
 };
 
 static struct usb_endpoint_descriptor
@@ -256,25 +264,15 @@ out:
                 dev_kfree_skb(skb);
                 dev->stats.tx_dropped++;
         }
-        return 0;
+        return NETDEV_TX_OK;
 }
 
 static int pn_net_mtu(struct net_device *dev, int new_mtu)
 {
-        struct phonet_port *port = netdev_priv(dev);
-        unsigned long flags;
-        int err = -EBUSY;
-
         if ((new_mtu < PHONET_MIN_MTU) || (new_mtu > PHONET_MAX_MTU))
                 return -EINVAL;
-
-        spin_lock_irqsave(&port->lock, flags);
-        if (!netif_carrier_ok(dev)) {
-                dev->mtu = new_mtu;
-                err = 0;
-        }
-        spin_unlock_irqrestore(&port->lock, flags);
-        return err;
+        dev->mtu = new_mtu;
+        return 0;
 }
 
 static const struct net_device_ops pn_netdev_ops = {
@@ -308,21 +306,21 @@ static void pn_net_setup(struct net_device *dev)
 static int
 pn_rx_submit(struct f_phonet *fp, struct usb_request *req, gfp_t gfp_flags)
 {
-        struct sk_buff *skb;
-        const size_t size = fp->dev->mtu;
+        struct net_device *dev = fp->dev;
+        struct page *page;
         int err;
 
-        skb = alloc_skb(size, gfp_flags);
-        if (!skb)
+        page = __netdev_alloc_page(dev, gfp_flags);
+        if (!page)
                 return -ENOMEM;
 
-        req->buf = skb->data;
-        req->length = size;
-        req->context = skb;
+        req->buf = page_address(page);
+        req->length = PAGE_SIZE;
+        req->context = page;
 
         err = usb_ep_queue(fp->out_ep, req, gfp_flags);
         if (unlikely(err))
-                dev_kfree_skb_any(skb);
+                netdev_free_page(dev, page);
         return err;
 }
 
@@ -330,25 +328,37 @@ static void pn_rx_complete(struct usb_ep *ep, struct usb_request *req)
 {
         struct f_phonet *fp = ep->driver_data;
         struct net_device *dev = fp->dev;
-        struct sk_buff *skb = req->context;
+        struct page *page = req->context;
+        struct sk_buff *skb;
+        unsigned long flags;
         int status = req->status;
 
         switch (status) {
         case 0:
-                if (unlikely(!netif_running(dev)))
-                        break;
-                if (unlikely(req->actual < 1))
+                spin_lock_irqsave(&fp->rx.lock, flags);
+                skb = fp->rx.skb;
+                if (!skb)
+                        skb = fp->rx.skb = netdev_alloc_skb(dev, 12);
+                if (req->actual < req->length) /* Last fragment */
+                        fp->rx.skb = NULL;
+                spin_unlock_irqrestore(&fp->rx.lock, flags);
+
+                if (unlikely(!skb))
                         break;
-                skb_put(skb, req->actual);
-                skb->protocol = htons(ETH_P_PHONET);
-                skb_reset_mac_header(skb);
-                __skb_pull(skb, 1);
-                skb->dev = dev;
-                dev->stats.rx_packets++;
-                dev->stats.rx_bytes += skb->len;
-
-                netif_rx(skb);
-                skb = NULL;
+                skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, page, 0,
+                                req->actual);
+                page = NULL;
+
+                if (req->actual < req->length) { /* Last fragment */
+                        skb->protocol = htons(ETH_P_PHONET);
+                        skb_reset_mac_header(skb);
+                        pskb_pull(skb, 1);
+                        skb->dev = dev;
+                        dev->stats.rx_packets++;
+                        dev->stats.rx_bytes += skb->len;
+
+                        netif_rx(skb);
+                }
                 break;
 
         /* Do not resubmit in these cases: */
@@ -366,8 +376,8 @@ static void pn_rx_complete(struct usb_ep *ep, struct usb_request *req)
                 break;
         }
 
-        if (skb)
-                dev_kfree_skb_any(skb);
+        if (page)
+                netdev_free_page(dev, page);
         if (req)
                 pn_rx_submit(fp, req, GFP_ATOMIC);
 }
@@ -385,6 +395,10 @@ static void __pn_reset(struct usb_function *f)
 
         usb_ep_disable(fp->out_ep);
         usb_ep_disable(fp->in_ep);
+        if (fp->rx.skb) {
+                dev_kfree_skb_irq(fp->rx.skb);
+                fp->rx.skb = NULL;
+        }
 }
 
 static int pn_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
@@ -583,6 +597,7 @@ int __init phonet_bind_config(struct usb_configuration *c)
         fp->function.set_alt = pn_set_alt;
         fp->function.get_alt = pn_get_alt;
         fp->function.disable = pn_disconnect;
+        spin_lock_init(&fp->rx.lock);
 
         err = usb_add_function(c, &fp->function);
         if (err)
diff --git a/drivers/usb/gadget/u_ether.c b/drivers/usb/gadget/u_ether.c
index 016f63b39028..c66521953917 100644
--- a/drivers/usb/gadget/u_ether.c
+++ b/drivers/usb/gadget/u_ether.c
@@ -181,7 +181,7 @@ static void eth_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *p)
  *   - ... probably more ethtool ops
  */
 
-static struct ethtool_ops ops = {
+static const struct ethtool_ops ops = {
         .get_drvinfo = eth_get_drvinfo,
         .get_link = ethtool_op_get_link,
 };
@@ -465,7 +465,8 @@ static inline int is_promisc(u16 cdc_filter)
         return cdc_filter & USB_CDC_PACKET_TYPE_PROMISCUOUS;
 }
 
-static int eth_start_xmit(struct sk_buff *skb, struct net_device *net)
+static netdev_tx_t eth_start_xmit(struct sk_buff *skb,
+                                        struct net_device *net)
 {
         struct eth_dev          *dev = netdev_priv(net);
         int                     length = skb->len;
@@ -487,7 +488,7 @@ static int eth_start_xmit(struct sk_buff *skb, struct net_device *net)
 
         if (!in) {
                 dev_kfree_skb_any(skb);
-                return 0;
+                return NETDEV_TX_OK;
         }
 
         /* apply outgoing CDC or RNDIS filters */
@@ -506,7 +507,7 @@ static int eth_start_xmit(struct sk_buff *skb, struct net_device *net)
                                 type = USB_CDC_PACKET_TYPE_ALL_MULTICAST;
                         if (!(cdc_filter & type)) {
                                 dev_kfree_skb_any(skb);
-                                return 0;
+                                return NETDEV_TX_OK;
                         }
                 }
                 /* ignores USB_CDC_PACKET_TYPE_DIRECTED */
@@ -586,7 +587,7 @@ drop:
                 list_add(&req->list, &dev->tx_reqs);
                 spin_unlock_irqrestore(&dev->req_lock, flags);
         }
-        return 0;
+        return NETDEV_TX_OK;
 }
 
 /*-------------------------------------------------------------------------*/