diff options
| author |   Arik Nemtsov <arik@wizery.com> | 2012-11-28 11:42:33 +0200 |
|---|---|---|
| committer |   Luciano Coelho <coelho@ti.com> | 2012-12-11 09:38:23 +0200 |
| commit | f4d02007cdd56c59bdb9362c699875cb2d02c0fe (patch) | |
| tree | c5529595af8b0e83d0d9199ab3bf1e55a85a4e29 /drivers/net/wireless/ti/wlcore/tx.c | |
| parent | wlcore: add ACX_PEER_CAP command (diff) | |
| download | linux-dev-f4d02007cdd56c59bdb9362c699875cb2d02c0fe.tar.xz linux-dev-f4d02007cdd56c59bdb9362c699875cb2d02c0fe.zip | |
wlcore: remove support for injected Tx
Require each incoming packet to have a valid vif. The injected Tx code
path was buggy (and unused), so disallow it altogether.
Cleanup a few places and add a warning so we can better discover
anomalies (corrupted skbs?) masquerading as injected Tx.
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/ti/wlcore/tx.c')
| -rw-r--r-- | drivers/net/wireless/ti/wlcore/tx.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/ti/wlcore/tx.c b/drivers/net/wireless/ti/wlcore/tx.c index fbda3cbca7e7..8f5ea89b03b1 100644 --- a/drivers/net/wireless/ti/wlcore/tx.c +++ b/drivers/net/wireless/ti/wlcore/tx.c @@ -157,9 +157,6 @@ u8 wl12xx_tx_get_hlid(struct wl1271 *wl, struct wl12xx_vif *wlvif, { struct ieee80211_tx_info *control; - if (!wlvif || wl12xx_is_dummy_packet(wl, skb)) - return wl->system_hlid; - if (wlvif->bss_type == BSS_TYPE_AP_BSS) return wl12xx_tx_get_hlid_ap(wl, wlvif, skb, sta); @@ -764,7 +761,7 @@ int wlcore_tx_work_locked(struct wl1271 *wl) bool has_data = false; wlvif = NULL; - if (!wl12xx_is_dummy_packet(wl, skb) && info->control.vif) + if (!wl12xx_is_dummy_packet(wl, skb)) wlvif = wl12xx_vif_to_data(info->control.vif); else hlid = wl->system_hlid; |