diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-30 17:53:32 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-30 17:53:32 -0400 |
| commit | 65fb0d23fcddd8697c871047b700c78817bdaa43 (patch) | |
| tree | 119e6e5f276622c4c862f6c9b6d795264ba1603a /net/mac80211/wme.h | |
| parent | 8c083f081d0014057901c68a0a3e0f8ca7ac8d23 (diff) | |
| parent | dfbbe89e197a77f2c8046a51c74e33e35f878080 (diff) | |
Merge branch 'linus' into cpumask-for-linus
Conflicts:
arch/x86/kernel/cpu/common.c
Diffstat (limited to 'net/mac80211/wme.h')
| -rw-r--r-- | net/mac80211/wme.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/mac80211/wme.h b/net/mac80211/wme.h index bc62f28a4d3d..7520d2e014dc 100644 --- a/net/mac80211/wme.h +++ b/net/mac80211/wme.h | |||
| @@ -21,11 +21,5 @@ | |||
| 21 | extern const int ieee802_1d_to_ac[8]; | 21 | extern const int ieee802_1d_to_ac[8]; |
| 22 | 22 | ||
| 23 | u16 ieee80211_select_queue(struct net_device *dev, struct sk_buff *skb); | 23 | u16 ieee80211_select_queue(struct net_device *dev, struct sk_buff *skb); |
| 24 | int ieee80211_ht_agg_queue_add(struct ieee80211_local *local, | ||
| 25 | struct sta_info *sta, u16 tid); | ||
| 26 | void ieee80211_ht_agg_queue_remove(struct ieee80211_local *local, | ||
| 27 | struct sta_info *sta, u16 tid, | ||
| 28 | u8 requeue); | ||
| 29 | void ieee80211_requeue(struct ieee80211_local *local, int queue); | ||
| 30 | 24 | ||
| 31 | #endif /* _WME_H */ | 25 | #endif /* _WME_H */ |