aboutsummaryrefslogtreecommitdiff
path: root/net/mac80211/wme.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-07-26 10:01:25 -0700
committerDavid S. Miller <davem@davemloft.net>2009-07-26 10:01:25 -0700
commitc8b201ff867e64b6233d069563081775269f4499 (patch)
tree35d363e6cb565fd7285480dc877a2da79eafb9a7 /net/mac80211/wme.h
parent436b355b96042ab6564f43a7dabd5c61d9634ff7 (diff)
parent249b405cf8145da8a74b70544ae1079d244bdb00 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/wme.h')
-rw-r--r--net/mac80211/wme.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/wme.h b/net/mac80211/wme.h
index 7520d2e014d..d4fd87ca511 100644
--- a/net/mac80211/wme.h
+++ b/net/mac80211/wme.h
@@ -20,6 +20,7 @@
extern const int ieee802_1d_to_ac[8];
-u16 ieee80211_select_queue(struct net_device *dev, struct sk_buff *skb);
+void ieee80211_select_queue(struct ieee80211_local *local,
+ struct sk_buff *skb);
#endif /* _WME_H */