diff options
author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-07-27 15:38:35 -0700 |
---|---|---|
committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-07-29 22:12:20 -0700 |
commit | fbfadde3318e3e9e22c26fa61e2119c357f349af (patch) | |
tree | 56c562a41cb386ff2564a8406203d5c15a5c7036 /patches/collateral-evolutions/network/40-netdev-hw-features | |
parent | 0cbba25bdf70ec3d7f2a27e36db295f535dcd230 (diff) |
backports: refresh patches for next-20130703
1 2.6.24 [ OK ]
2 2.6.25 [ OK ]
3 2.6.26 [ OK ]
4 2.6.27 [ OK ]
5 2.6.28 [ OK ]
6 2.6.29 [ OK ]
7 2.6.30 [ OK ]
8 2.6.31 [ OK ]
9 2.6.32 [ OK ]
10 2.6.33 [ OK ]
11 2.6.34 [ OK ]
12 2.6.35 [ OK ]
13 2.6.36 [ OK ]
14 2.6.37 [ OK ]
15 2.6.38 [ OK ]
16 2.6.39 [ OK ]
17 3.0.79 [ OK ]
18 3.1.10 [ OK ]
19 3.10-rc1 [ OK ]
20 3.2.45 [ OK ]
21 3.3.8 [ OK ]
22 3.4.46 [ OK ]
23 3.5.7 [ OK ]
24 3.6.11 [ OK ]
25 3.7.10 [ OK ]
26 3.8.13 [ OK ]
27 3.9.3 [ OK ]
real 32m59.877s
user 880m31.524s
sys 124m11.996s
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches/collateral-evolutions/network/40-netdev-hw-features')
-rw-r--r-- | patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_alx_main.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_alx_main.patch b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_alx_main.patch index 35e33717..4adbb0d9 100644 --- a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_alx_main.patch +++ b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_alx_main.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/atheros/alx/main.c +++ b/drivers/net/ethernet/atheros/alx/main.c -@@ -737,6 +737,7 @@ static int alx_init_sw(struct alx_priv * +@@ -738,6 +738,7 @@ static int alx_init_sw(struct alx_priv * } @@ -8,7 +8,7 @@ static netdev_features_t alx_fix_features(struct net_device *netdev, netdev_features_t features) { -@@ -745,6 +746,7 @@ static netdev_features_t alx_fix_feature +@@ -746,6 +747,7 @@ static netdev_features_t alx_fix_feature return features; } @@ -16,7 +16,7 @@ static void alx_netif_stop(struct alx_priv *alx) { -@@ -820,7 +822,17 @@ static int alx_change_mtu(struct net_dev +@@ -822,7 +824,17 @@ static int alx_change_mtu(struct net_dev alx->hw.mtu = mtu; alx->rxbuf_size = mtu > ALX_DEF_RXBUF_SIZE ? ALIGN(max_frame, 8) : ALX_DEF_RXBUF_SIZE; @@ -34,7 +34,7 @@ if (netif_running(netdev)) alx_reinit(alx); return 0; -@@ -1238,7 +1250,9 @@ static const struct net_device_ops alx_n +@@ -1241,7 +1253,9 @@ static const struct net_device_ops alx_n .ndo_change_mtu = alx_change_mtu, .ndo_do_ioctl = alx_ioctl, .ndo_tx_timeout = alx_tx_timeout, @@ -44,7 +44,7 @@ #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = alx_poll_controller, #endif -@@ -1361,7 +1375,11 @@ static int alx_probe(struct pci_dev *pde +@@ -1364,7 +1378,11 @@ static int alx_probe(struct pci_dev *pde } } |