openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mac80211: fix wme code 

In commit e100bb64bf (mac80211:
QoS related cleanups) I accidentally changed a variable from
int to u16 causing a warning that a comparison for < 0 was always
false. John thought this was a missing deletion of code and removed
the warning by deleting the never executed branch of code in commit
3df5ee60f1 (wireless: fix warning
introduced by "mac80211: QoS related cleanups") but the problem really
was my mistake of using a u16 variable for the queue variable when
that variable can also contain an error code. This patch restores
the original code and variable type.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg 2008-05-03 00:44:09 +02:00 committed by John W. Linville
parent 3df5ee60f1
commit 5c5e12898a
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
net/mac80211/wme.c
View File

@ -155,8 +155,7 @@ static int wme_qdiscop_enqueue(struct sk_buff *skb, struct Qdisc* qd)
unsigned short fc = le16_to_cpu(hdr->frame_control); unsigned short fc = le16_to_cpu(hdr->frame_control);
struct Qdisc *qdisc; struct Qdisc *qdisc;
struct sta_info *sta; struct sta_info *sta;
int err; int err, queue;
u16 queue;
u8 tid; u8 tid;
if (pkt_data->flags & IEEE80211_TXPD_REQUEUE) { if (pkt_data->flags & IEEE80211_TXPD_REQUEUE) {
@ -216,15 +215,20 @@ static int wme_qdiscop_enqueue(struct sk_buff *skb, struct Qdisc* qd)
rcu_read_unlock(); rcu_read_unlock();
} }
tid = skb->priority & QOS_CONTROL_TAG1D_MASK; if (unlikely(queue < 0)) {
pkt_data->queue = (unsigned int) queue; kfree_skb(skb);
qdisc = q->queues[queue]; err = NET_XMIT_DROP;
err = qdisc->enqueue(skb, qdisc); } else {
if (err == NET_XMIT_SUCCESS) { tid = skb->priority & QOS_CONTROL_TAG1D_MASK;
qd->q.qlen++; pkt_data->queue = (unsigned int) queue;
qd->bstats.bytes += skb->len; qdisc = q->queues[queue];
qd->bstats.packets++; err = qdisc->enqueue(skb, qdisc);
return NET_XMIT_SUCCESS; if (err == NET_XMIT_SUCCESS) {
qd->q.qlen++;
qd->bstats.bytes += skb->len;
qd->bstats.packets++;
return NET_XMIT_SUCCESS;
}
} }
qd->qstats.drops++; qd->qstats.drops++;
return err; return err;