diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-25 00:59:22 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-25 00:59:22 +0100 |
| commit | 3c701651c8c5f35e846512070cdbf2f5980db62c (patch) | |
| tree | 529271b31a849062491afce37527cb41dab65746 /drivers/net/wireless/mwifiex/main.c | |
| parent | usb: host: remove selects of USB_ARCH_HAS_?HCI (diff) | |
| parent | Linux 3.14-rc4 (diff) | |
| download | linux-3c701651c8c5f35e846512070cdbf2f5980db62c.tar.xz linux-3c701651c8c5f35e846512070cdbf2f5980db62c.zip | |
Merge 3.14-rc4 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/wireless/mwifiex/main.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c index 4d79761b9c87..9d3d2758ec35 100644 --- a/drivers/net/wireless/mwifiex/main.c +++ b/drivers/net/wireless/mwifiex/main.c @@ -748,7 +748,7 @@ static struct net_device_stats *mwifiex_get_stats(struct net_device *dev) static u16 mwifiex_netdev_select_wmm_queue(struct net_device *dev, struct sk_buff *skb, - void *accel_priv) + void *accel_priv, select_queue_fallback_t fallback) { skb->priority = cfg80211_classify8021d(skb, NULL); return mwifiex_1d_to_wmm_queue[skb->priority]; |