mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* 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:
commit
6634160abf
6 changed files with 13 additions and 9 deletions
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue