iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zd1211rw: Do not panic on device eject when associated

Browse Source 
zd_op_tx() must not return an arbitrary error value since that can
leave mac80211 trying to retransmit the frame and with the extra data
pushed into the beginning of the skb on every attempt, this will end up
causing a kernel panic (skb_under_panic from skb_push call). This can
happen, e.g., when ejecting the device when associated.

Signed-off-by: Jouni Malinen <j@w1.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Jouni Malinen 2009-03-16 21:47:33 +02:00 committed by John W. Linville
parent 055249d20d
commit 640c65eae6
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/wireless/zd1211rw/zd_mac.c
View File

@ -575,13 +575,17 @@ static int zd_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
r = fill_ctrlset(mac, skb); r = fill_ctrlset(mac, skb);
if (r) if (r)
return r; goto fail;
info->rate_driver_data[0] = hw; info->rate_driver_data[0] = hw;
r = zd_usb_tx(&mac->chip.usb, skb); r = zd_usb_tx(&mac->chip.usb, skb);
if (r) if (r)
return r; goto fail;
return 0;
fail:
dev_kfree_skb(skb);
return 0; return 0;
} }