diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-09-07 12:56:05 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-10-25 16:20:25 +0200 |
commit | 7793930ad12f67c15bab95fa3cea34345472722f (patch) | |
tree | 473259b8f63713fced5b92f0306df03ac38e96da /patches/collateral-evolutions/network/84-ethernet/0012-igb_ndo_set_vf_spoofchk.patch | |
parent | 36f33cbcb7b2652850f76a7413adf17f12fdf5e8 (diff) |
backports: refresh on v3.14.22v3.14.22-1linux-3.14.y
1 3.0.101 [ OK ]
2 3.1.10 [ OK ]
3 3.2.62 [ OK ]
4 3.3.8 [ OK ]
5 3.4.104 [ OK ]
6 3.5.7 [ OK ]
7 3.6.11 [ OK ]
8 3.7.10 [ OK ]
9 3.8.13 [ OK ]
10 3.9.11 [ OK ]
11 3.10.58 [ OK ]
12 3.11.10 [ OK ]
13 3.12.31 [ OK ]
14 3.13.11 [ OK ]
15 3.14.22 [ OK ]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/84-ethernet/0012-igb_ndo_set_vf_spoofchk.patch')
-rw-r--r-- | patches/collateral-evolutions/network/84-ethernet/0012-igb_ndo_set_vf_spoofchk.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/collateral-evolutions/network/84-ethernet/0012-igb_ndo_set_vf_spoofchk.patch b/patches/collateral-evolutions/network/84-ethernet/0012-igb_ndo_set_vf_spoofchk.patch index dec9a830..a10af55e 100644 --- a/patches/collateral-evolutions/network/84-ethernet/0012-igb_ndo_set_vf_spoofchk.patch +++ b/patches/collateral-evolutions/network/84-ethernet/0012-igb_ndo_set_vf_spoofchk.patch @@ -13,7 +13,7 @@ index 35ac7d8..e609f71 100644 static int igb_ndo_get_vf_config(struct net_device *netdev, int vf, struct ifla_vf_info *ivi); static void igb_check_vf_rate_limit(struct igb_adapter *); -@@ -2056,7 +2058,9 @@ static const struct net_device_ops igb_n +@@ -2063,7 +2065,9 @@ static const struct net_device_ops igb_n .ndo_set_vf_mac = igb_ndo_set_vf_mac, .ndo_set_vf_vlan = igb_ndo_set_vf_vlan, .ndo_set_vf_tx_rate = igb_ndo_set_vf_bw, @@ -23,7 +23,7 @@ index 35ac7d8..e609f71 100644 .ndo_get_vf_config = igb_ndo_get_vf_config, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = igb_netpoll, -@@ -7854,6 +7858,7 @@ static int igb_ndo_set_vf_bw(struct net_ +@@ -7877,6 +7881,7 @@ static int igb_ndo_set_vf_bw(struct net_ return 0; } @@ -31,7 +31,7 @@ index 35ac7d8..e609f71 100644 static int igb_ndo_set_vf_spoofchk(struct net_device *netdev, int vf, bool setting) { -@@ -7880,6 +7885,7 @@ static int igb_ndo_set_vf_spoofchk(struc +@@ -7903,6 +7908,7 @@ static int igb_ndo_set_vf_spoofchk(struc adapter->vf_data[vf].spoofchk_enabled = setting; return E1000_SUCCESS; } @@ -39,7 +39,7 @@ index 35ac7d8..e609f71 100644 static int igb_ndo_get_vf_config(struct net_device *netdev, int vf, struct ifla_vf_info *ivi) -@@ -7892,7 +7898,9 @@ static int igb_ndo_get_vf_config(struct +@@ -7915,7 +7921,9 @@ static int igb_ndo_get_vf_config(struct ivi->tx_rate = adapter->vf_data[vf].tx_rate; ivi->vlan = adapter->vf_data[vf].pf_vlan; ivi->qos = adapter->vf_data[vf].pf_qos; |