xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge upstream into ieee80211.

Browse Source 
Hand-fix merge conflict in drivers/usb/net/zd1201.c.
This commit is contained in:
Jeff Garzik
2005-08-24 01:02:04 -04:00
parent 1b5cca3a88 0572e3da3f
commit b2382b363d
246 changed files with 1729 additions and 1386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/usb/net/usbnet.c
View File

@@ -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

3
drivers/usb/net/zd1201.c
View File

@@ -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);