diff options
| author | David S. Miller <davem@davemloft.net> | 2014-01-14 17:37:09 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-14 17:42:42 -0500 |
| commit | 0a379e21c503b2ff66b44d588df9f231e9b0b9ca (patch) | |
| tree | 22b875fcf4b67fcd007726f00c5fc1748ce985d0 /drivers/net/wireless/mwifiex/main.c | |
| parent | a49da8811e71c5355b52c65ee32976741d5834cd (diff) | |
| parent | fdc3452cd2c7b2bfe0f378f92123f4f9a98fa2bd (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/wireless/mwifiex/main.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c index 2d6f5e1721cf..4d79761b9c87 100644 --- a/drivers/net/wireless/mwifiex/main.c +++ b/drivers/net/wireless/mwifiex/main.c | |||
| @@ -747,7 +747,8 @@ static struct net_device_stats *mwifiex_get_stats(struct net_device *dev) | |||
| 747 | } | 747 | } |
| 748 | 748 | ||
| 749 | static u16 | 749 | static u16 |
| 750 | mwifiex_netdev_select_wmm_queue(struct net_device *dev, struct sk_buff *skb) | 750 | mwifiex_netdev_select_wmm_queue(struct net_device *dev, struct sk_buff *skb, |
| 751 | void *accel_priv) | ||
| 751 | { | 752 | { |
| 752 | skb->priority = cfg80211_classify8021d(skb, NULL); | 753 | skb->priority = cfg80211_classify8021d(skb, NULL); |
| 753 | return mwifiex_1d_to_wmm_queue[skb->priority]; | 754 | return mwifiex_1d_to_wmm_queue[skb->priority]; |