diff options
author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2014-04-15 20:07:36 +0000 |
---|---|---|
committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2014-04-17 16:23:09 -0700 |
commit | 2a25483c93f9f7b0c36c8dcca7e1aae54f7602f8 (patch) | |
tree | c6bdd5f7329ca88beebc9a5414f4f823455effcf /patches/the-way-not-to-do-backports/0001-ethernet-igb/0012-igb_ndo_set_vf_spoofchk.patch | |
parent | 8e8f67c859b5968534c30c42eda1a3fd0fbc4352 (diff) |
backports: refresh patches for next-20140415
This update required one collateral evolution to be addressed,
the rest was just a patch refresh.
mcgrof@drvbp1 ~/backports (git::master)$ time ./gentree.py --clean
--refresh /home/mcgrof/linux-next /home/mcgrof/build/next-20140415
Copy original source files ...
Apply patches ...
Modify Kconfig tree ...
Rewrite Makefiles and Kconfig files ...
Done!
real 1m16.527s
user 10m47.068s
sys 0m37.412s
1 3.0.101 [ OK ]
2 3.1.10 [ OK ]
3 3.2.54 [ OK ]
4 3.3.8 [ OK ]
5 3.4.79 [ 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.29 [ OK ]
12 3.11.10 [ OK ]
13 3.12.10 [ OK ]
14 3.13.2 [ OK ]
15 3.14-rc1 [ OK ]
real 18m42.577s
user 498m48.572s
sys 64m0.560s
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches/the-way-not-to-do-backports/0001-ethernet-igb/0012-igb_ndo_set_vf_spoofchk.patch')
-rw-r--r-- | patches/the-way-not-to-do-backports/0001-ethernet-igb/0012-igb_ndo_set_vf_spoofchk.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/the-way-not-to-do-backports/0001-ethernet-igb/0012-igb_ndo_set_vf_spoofchk.patch b/patches/the-way-not-to-do-backports/0001-ethernet-igb/0012-igb_ndo_set_vf_spoofchk.patch index ad19752d..a2c5ddb7 100644 --- a/patches/the-way-not-to-do-backports/0001-ethernet-igb/0012-igb_ndo_set_vf_spoofchk.patch +++ b/patches/the-way-not-to-do-backports/0001-ethernet-igb/0012-igb_ndo_set_vf_spoofchk.patch @@ -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, -@@ -7934,6 +7938,7 @@ static int igb_ndo_set_vf_bw(struct net_ +@@ -7935,6 +7939,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) { -@@ -7960,6 +7965,7 @@ static int igb_ndo_set_vf_spoofchk(struc +@@ -7961,6 +7966,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) -@@ -7972,7 +7978,9 @@ static int igb_ndo_get_vf_config(struct +@@ -7973,7 +7979,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; |