diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /net/mac80211/wme.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'net/mac80211/wme.h')
| -rw-r--r-- | net/mac80211/wme.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/mac80211/wme.h b/net/mac80211/wme.h index d4fd87ca5118..6053b1c9feee 100644 --- a/net/mac80211/wme.h +++ b/net/mac80211/wme.h | |||
| @@ -20,7 +20,11 @@ | |||
| 20 | 20 | ||
| 21 | extern const int ieee802_1d_to_ac[8]; | 21 | extern const int ieee802_1d_to_ac[8]; |
| 22 | 22 | ||
| 23 | void ieee80211_select_queue(struct ieee80211_local *local, | 23 | u16 ieee80211_select_queue(struct ieee80211_sub_if_data *sdata, |
| 24 | struct sk_buff *skb); | 24 | struct sk_buff *skb); |
| 25 | void ieee80211_set_qos_hdr(struct ieee80211_local *local, struct sk_buff *skb); | ||
| 26 | u16 ieee80211_downgrade_queue(struct ieee80211_local *local, | ||
| 27 | struct sk_buff *skb); | ||
| 28 | |||
| 25 | 29 | ||
| 26 | #endif /* _WME_H */ | 30 | #endif /* _WME_H */ |