Merge upstream into ieee80211.

Hand-fix merge conflict in drivers/usb/net/zd1201.c.

2 files changed, 2 insertions, 3 deletions

diff --git a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c
index 576f3b852fce..4528a00c45b0 100644
--- a/drivers/usb/net/usbnet.c
+++ b/drivers/usb/net/usbnet.c
@@ -1922,7 +1922,7 @@ static int genelink_rx_fixup (struct usbnet *dev, struct sk_buff *skb)
 
                         // copy the packet data to the new skb
                         memcpy(skb_put(gl_skb, size), packet->packet_data, size);
-                        skb_return (dev, skb);
+                        skb_return (dev, gl_skb);
                 }
 
                 // advance to the next packet
diff --git a/drivers/usb/net/zd1201.c b/drivers/usb/net/zd1201.c
index 2a1d489e92c0..fc013978837e 100644
--- a/drivers/usb/net/zd1201.c
+++ b/drivers/usb/net/zd1201.c
@@ -346,8 +346,7 @@ static void zd1201_usbrx(struct urb *urb, struct pt_regs *regs)
                         if (datalen<14)
                                 goto resubmit;
                         if ((seq & IEEE80211_SCTL_FRAG) == 0) {
-                                frag = kmalloc(sizeof(struct zd1201_frag*),
-                                    GFP_ATOMIC);
+                                frag = kmalloc(sizeof(*frag), GFP_ATOMIC);
                                 if (!frag)
                                         goto resubmit;
                                 skb = dev_alloc_skb(IEEE80211_DATA_LEN +14+2);