diff options
author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2014-03-29 22:09:57 +0000 |
---|---|---|
committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2014-04-08 18:16:21 -0700 |
commit | ae919302cc8c1c93a1f1b8b7e086abfe13771286 (patch) | |
tree | 97430c31a96601786ac27d7fb4920bf3b0f40633 /patches/collateral-evolutions/network/84-ethernet/0010-igb_ethtool_ops.patch | |
parent | 8680eb1be12f4121fa4a49cbf6b4e043cdbb1c73 (diff) |
backports: refresh patches based on next-20140311backports-20140311
1 2.6.25 [ OK ]
2 2.6.26 [ OK ]
3 2.6.27 [ OK ]
4 2.6.28 [ OK ]
5 2.6.29 [ OK ]
6 2.6.30 [ OK ]
7 2.6.31 [ OK ]
8 2.6.32 [ OK ]
9 2.6.33 [ OK ]
10 2.6.34 [ OK ]
11 2.6.35 [ OK ]
12 2.6.36 [ OK ]
13 2.6.37 [ OK ]
14 2.6.38 [ OK ]
15 2.6.39 [ OK ]
16 3.0.101 [ OK ]
17 3.1.10 [ OK ]
18 3.2.54 [ OK ]
19 3.3.8 [ OK ]
20 3.4.79 [ OK ]
21 3.5.7 [ OK ]
22 3.6.11 [ OK ]
23 3.7.10 [ OK ]
24 3.8.13 [ OK ]
25 3.9.11 [ OK ]
26 3.10.29 [ OK ]
27 3.11.10 [ OK ]
28 3.12.10 [ OK ]
29 3.13.2 [ OK ]
30 3.14-rc1 [ OK ]
Generation time:
real 1m32.523s
user 23m51.796s
sys 0m28.872s
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches/collateral-evolutions/network/84-ethernet/0010-igb_ethtool_ops.patch')
-rw-r--r-- | patches/collateral-evolutions/network/84-ethernet/0010-igb_ethtool_ops.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/patches/collateral-evolutions/network/84-ethernet/0010-igb_ethtool_ops.patch b/patches/collateral-evolutions/network/84-ethernet/0010-igb_ethtool_ops.patch index aa50dd1b..c847a4cf 100644 --- a/patches/collateral-evolutions/network/84-ethernet/0010-igb_ethtool_ops.patch +++ b/patches/collateral-evolutions/network/84-ethernet/0010-igb_ethtool_ops.patch @@ -2,7 +2,7 @@ diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet index 3cf9600..5e519ce 100644 --- a/drivers/net/ethernet/intel/igb/igb_ethtool.c +++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c -@@ -2817,6 +2817,7 @@ static void igb_ethtool_complete(struct +@@ -2816,6 +2816,7 @@ static void igb_ethtool_complete(struct pm_runtime_put(&adapter->pdev->dev); } @@ -10,7 +10,7 @@ index 3cf9600..5e519ce 100644 static u32 igb_get_rxfh_indir_size(struct net_device *netdev) { return IGB_RETA_SIZE; -@@ -2832,6 +2833,7 @@ static int igb_get_rxfh_indir(struct net +@@ -2831,6 +2832,7 @@ static int igb_get_rxfh_indir(struct net return 0; } @@ -18,7 +18,7 @@ index 3cf9600..5e519ce 100644 void igb_write_rss_indir_tbl(struct igb_adapter *adapter) { -@@ -2868,6 +2870,7 @@ void igb_write_rss_indir_tbl(struct igb_ +@@ -2867,6 +2869,7 @@ void igb_write_rss_indir_tbl(struct igb_ } } @@ -26,7 +26,7 @@ index 3cf9600..5e519ce 100644 static int igb_set_rxfh_indir(struct net_device *netdev, const u32 *indir) { struct igb_adapter *adapter = netdev_priv(netdev); -@@ -2900,6 +2903,7 @@ static int igb_set_rxfh_indir(struct net +@@ -2899,6 +2902,7 @@ static int igb_set_rxfh_indir(struct net return 0; } @@ -34,7 +34,7 @@ index 3cf9600..5e519ce 100644 static unsigned int igb_max_channels(struct igb_adapter *adapter) { -@@ -3022,9 +3026,11 @@ static const struct ethtool_ops igb_etht +@@ -3021,9 +3025,11 @@ static const struct ethtool_ops igb_etht .get_module_info = igb_get_module_info, .get_module_eeprom = igb_get_module_eeprom, #endif |