dasharo/linux
0
0
Fork 0
mirror of https://github.com/Dasharo/linux.git synced 2026-03-06 15:25:10 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  syncookies: fix inclusion of tcp options in syn-ack
  libertas: free sk_buff with kfree_skb
  btsdio: free sk_buff with kfree_skb
  Phonet: do not reply to indication reset packets
  Phonet: include generic link-layer header size in MAX_PHONET_HEADER
This commit is contained in:
Linus Torvalds
2008-10-27 08:41:13 -07:00
parent 526719ba51 8b5f12d04b
commit 6634160abf
6 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/bluetooth/btsdio.c
+1 -1
View File
@@ -152,7 +152,7 @@ static int btsdio_rx_packet(struct btsdio_data *data)
err = sdio_readsb(data->func, skb->data, REG_RDAT, len - 4);
if (err < 0) {
kfree(skb);
kfree_skb(skb);
return err;
}
drivers/net/wireless/libertas/rx.c
+1 -1
View File
@@ -328,7 +328,7 @@ static int process_rxed_802_11_packet(struct lbs_private *priv,
lbs_deb_rx("rx err: frame received with bad length\n");
priv->stats.rx_length_errors++;
ret = -EINVAL;
kfree(skb);
kfree_skb(skb);
goto done;
}