diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-07-19 15:05:11 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-07-23 23:30:46 +0200 |
| commit | 22cdc9b32ee4fc4ce997f69ef7b4549ac95a1434 (patch) | |
| tree | 9879b004c812964a53a4f4405367c742b8c07771 /patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch | |
| parent | 37da55ab322d36f65807b58bfa3a03b26a21c3be (diff) | |
backports: add some ubuntu trusty specific changes
It is now possible to detect a ubuntu kernel see:
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1327619
This uses the new define and adds some code depending on the ubuntu
trusty kernel.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch')
| -rw-r--r-- | patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch b/patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch index f7222926..bf609811 100644 --- a/patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch +++ b/patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch @@ -1,10 +1,11 @@ --- a/drivers/net/wireless/mwifiex/main.c +++ b/drivers/net/wireless/mwifiex/main.c -@@ -745,9 +745,18 @@ static struct net_device_stats *mwifiex_ +@@ -744,9 +744,19 @@ static struct net_device_stats *mwifiex_ return &priv->stats; } -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0) || \ ++ (LINUX_VERSION_CODE == KERNEL_VERSION(3,13,11) && UTS_UBUNTU_RELEASE_ABI > 30) static u16 mwifiex_netdev_select_wmm_queue(struct net_device *dev, struct sk_buff *skb, void *accel_priv, select_queue_fallback_t fallback) |