diff options
| author |   Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:02:04 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:02:04 -0400 |
| commit | b2382b363df828f25e35ed8b70a3da33b29b2a64 (patch) | |
| tree | 23aa2e70ba4650390c9281b3696172313bdb0f38 /drivers/usb/net | |
| parent | ieee80211: remove last uses of compat define WLAN_CAPABILITY_BSS (diff) | |
| parent | Linux v2.6.13-rc7 (diff) | |
| download | linux-dev-b2382b363df828f25e35ed8b70a3da33b29b2a64.tar.xz linux-dev-b2382b363df828f25e35ed8b70a3da33b29b2a64.zip | |
Merge upstream into ieee80211.
Hand-fix merge conflict in drivers/usb/net/zd1201.c.
Diffstat (limited to 'drivers/usb/net')
| -rw-r--r-- | drivers/usb/net/usbnet.c | 2 | ||||
| -rw-r--r-- | drivers/usb/net/zd1201.c | 3 |
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); |