diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2007-08-28 17:01:54 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:48:48 -0400 |
commit | e8bf96495cd67090b4900ddaf8e8672a17ec39fa (patch) | |
tree | 00630b109a928733217dc25ea1f5aefbf8b48a46 /net/mac80211/rx.c | |
parent | cf966838cd5596ca61d3e9949050442a943f6238 (diff) |
[MAC80211]: Remove bitfields from struct ieee80211_tx_packet_data
remove bitfields from struct ieee80211_tx_packet_data
[Johannes: completely clear flags in ieee80211_remove_tx_extra]
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r-- | net/mac80211/rx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 5a66269d9435..441383ced931 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c | |||
@@ -434,7 +434,7 @@ static int ap_sta_ps_end(struct net_device *dev, struct sta_info *sta) | |||
434 | while ((skb = skb_dequeue(&sta->tx_filtered)) != NULL) { | 434 | while ((skb = skb_dequeue(&sta->tx_filtered)) != NULL) { |
435 | pkt_data = (struct ieee80211_tx_packet_data *) skb->cb; | 435 | pkt_data = (struct ieee80211_tx_packet_data *) skb->cb; |
436 | sent++; | 436 | sent++; |
437 | pkt_data->requeue = 1; | 437 | pkt_data->flags |= IEEE80211_TXPD_REQUEUE; |
438 | dev_queue_xmit(skb); | 438 | dev_queue_xmit(skb); |
439 | } | 439 | } |
440 | while ((skb = skb_dequeue(&sta->ps_tx_buf)) != NULL) { | 440 | while ((skb = skb_dequeue(&sta->ps_tx_buf)) != NULL) { |
@@ -446,7 +446,7 @@ static int ap_sta_ps_end(struct net_device *dev, struct sta_info *sta) | |||
446 | "since STA not sleeping anymore\n", dev->name, | 446 | "since STA not sleeping anymore\n", dev->name, |
447 | MAC_ARG(sta->addr), sta->aid); | 447 | MAC_ARG(sta->addr), sta->aid); |
448 | #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */ | 448 | #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */ |
449 | pkt_data->requeue = 1; | 449 | pkt_data->flags |= IEEE80211_TXPD_REQUEUE; |
450 | dev_queue_xmit(skb); | 450 | dev_queue_xmit(skb); |
451 | } | 451 | } |
452 | 452 | ||