diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-09-17 23:31:36 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2018-09-19 11:04:33 +0200 |
commit | ab3fd3b9a801a9faa2619e2e65207e736f859a6d (patch) | |
tree | f0a6425fe00ba440e966570e662e6ff9c738d230 /patches/0038-ethtool_rxfh_indir/igb_rxfh_indir.patch | |
parent | 30a378636e473278ff65800b1fe58822e36d716c (diff) |
backports: Remove unused parts
This removes parts which were only used by subsystems which are not
included in backports any more, for example media, bluetooth and
Ethernet.
The patches which are removed in this commit are not applied to the
kernel tree anyway with the default configuration because non of the
files get copied. The freezer, media, regulator and sound parts were
only used by the already removed media drivers. The flow dissector file
is not copied any more.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/0038-ethtool_rxfh_indir/igb_rxfh_indir.patch')
-rw-r--r-- | patches/0038-ethtool_rxfh_indir/igb_rxfh_indir.patch | 92 |
1 files changed, 0 insertions, 92 deletions
diff --git a/patches/0038-ethtool_rxfh_indir/igb_rxfh_indir.patch b/patches/0038-ethtool_rxfh_indir/igb_rxfh_indir.patch deleted file mode 100644 index 73666630..00000000 --- a/patches/0038-ethtool_rxfh_indir/igb_rxfh_indir.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- a/drivers/net/ethernet/intel/igb/igb_ethtool.c -+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c -@@ -2860,19 +2860,28 @@ static void igb_ethtool_complete(struct - pm_runtime_put(&adapter->pdev->dev); - } - -+#if LINUX_VERSION_IS_GEQ(3,3,0) - static u32 igb_get_rxfh_indir_size(struct net_device *netdev) - { - return IGB_RETA_SIZE; - } - -+#if LINUX_VERSION_IS_GEQ(3,19,0) - static int igb_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key, - u8 *hfunc) -+#elif LINUX_VERSION_IS_GEQ(3,16,0) -+static int igb_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key) -+#else -+static int igb_get_rxfh(struct net_device *netdev, u32 *indir) -+#endif - { - struct igb_adapter *adapter = netdev_priv(netdev); - int i; - -+#if LINUX_VERSION_IS_GEQ(3,19,0) - if (hfunc) - *hfunc = ETH_RSS_HASH_TOP; -+#endif - if (!indir) - return 0; - for (i = 0; i < IGB_RETA_SIZE; i++) -@@ -2880,6 +2889,7 @@ static int igb_get_rxfh(struct net_devic - - return 0; - } -+#endif /* LINUX_VERSION_IS_GEQ(3,3,0) */ - - void igb_write_rss_indir_tbl(struct igb_adapter *adapter) - { -@@ -2916,18 +2926,28 @@ void igb_write_rss_indir_tbl(struct igb_ - } - } - -+#if LINUX_VERSION_IS_GEQ(3,3,0) -+#if LINUX_VERSION_IS_GEQ(3,19,0) - static int igb_set_rxfh(struct net_device *netdev, const u32 *indir, - const u8 *key, const u8 hfunc) -+#elif LINUX_VERSION_IS_GEQ(3,16,0) -+static int igb_set_rxfh(struct net_device *netdev, const u32 *indir, -+ const u8 *key) -+#else -+static int igb_set_rxfh(struct net_device *netdev, const u32 *indir) -+#endif - { - struct igb_adapter *adapter = netdev_priv(netdev); - struct e1000_hw *hw = &adapter->hw; - int i; - u32 num_queues; - -+#if LINUX_VERSION_IS_GEQ(3,19,0) - /* We do not allow change in unsupported parameters */ - if (key || - (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_TOP)) - return -EOPNOTSUPP; -+#endif - if (!indir) - return 0; - -@@ -2956,6 +2976,7 @@ static int igb_set_rxfh(struct net_devic - - return 0; - } -+#endif /* LINUX_VERSION_IS_GEQ(3,3,0) */ - - static unsigned int igb_max_channels(struct igb_adapter *adapter) - { -@@ -3075,9 +3096,15 @@ static const struct ethtool_ops igb_etht - .set_eee = igb_set_eee, - .get_module_info = igb_get_module_info, - .get_module_eeprom = igb_get_module_eeprom, -+#if LINUX_VERSION_IS_GEQ(3,16,0) - .get_rxfh_indir_size = igb_get_rxfh_indir_size, - .get_rxfh = igb_get_rxfh, - .set_rxfh = igb_set_rxfh, -+#elif LINUX_VERSION_IS_GEQ(3,3,0) -+ .get_rxfh_indir_size = igb_get_rxfh_indir_size, -+ .get_rxfh_indir = igb_get_rxfh, -+ .set_rxfh_indir = igb_set_rxfh, -+#endif /* LINUX_VERSION_IS_GEQ(3,3,0) */ - .get_channels = igb_get_channels, - .set_channels = igb_set_channels, - .begin = igb_ethtool_begin, |