summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-27 08:41:13 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-27 08:41:13 -0700
commit6634160abfdbac39bd5ebda516b15b078a0f598e (patch)
tree85a570445d953f011b4d00595868f449ac652028 /drivers
parent526719ba51e7d7bd31f7af9ab04b015b70096685 (diff)
parent8b5f12d04b2e93842f3dda01f029842047bf3f81 (diff)
downloadop-kernel-dev-6634160abfdbac39bd5ebda516b15b078a0f598e.zip
op-kernel-dev-6634160abfdbac39bd5ebda516b15b078a0f598e.tar.gz
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
Diffstat (limited to 'drivers')
-rw-r--r--drivers/bluetooth/btsdio.c2
-rw-r--r--drivers/net/wireless/libertas/rx.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/bluetooth/btsdio.c b/drivers/bluetooth/btsdio.c
index 58630cc..cda6c7c 100644
--- a/drivers/bluetooth/btsdio.c
+++ b/drivers/bluetooth/btsdio.c
@@ -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;
}
diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c
index 5749f22..079e6aa 100644
--- a/drivers/net/wireless/libertas/rx.c
+++ b/drivers/net/wireless/libertas/rx.c
@@ -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;
}
OpenPOWER on IntegriCloud