diff options
| author | Lennert Buytenhek <buytenh@wantstofly.org> | 2010-01-07 15:01:42 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-01-08 21:49:15 +0100 |
| commit | 045cfb71a3901005bf6dcedae98cecb3360a0bfc (patch) | |
| tree | ab237ace8b3e71cc7ac2e5a8a7f6b79a7a959bf2 /net | |
| parent | Revert "mac80211: replace netif_tx_{start,stop,wake}_all_queues" (diff) | |
| download | linux-045cfb71a3901005bf6dcedae98cecb3360a0bfc.tar.xz linux-045cfb71a3901005bf6dcedae98cecb3360a0bfc.zip | |
mac80211: fix queue selection for packets injected via monitor interface
Commit 'mac80211: fix skb buffering issue' added an ->ndo_select_queue()
for monitor interfaces which can end up dereferencing ieee802_1d_to_ac[]
beyond the end of the array for injected data packets (as skb->priority
isn't guaranteed to be zero or within [0:7]), which then triggers the
WARN_ON in net/core/dev.c:dev_cap_txqueue(). Fix this by always setting
the priority to zero on injected data frames.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Cc: stable@kernel.org
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/iface.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index ff762ed34f1e..44188ef80a63 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -685,6 +685,7 @@ static u16 ieee80211_monitor_select_queue(struct net_device *dev, return ieee802_1d_to_ac[skb->priority]; } + skb->priority = 0; return ieee80211_downgrade_queue(local, skb); } |