diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-11-21 17:53:08 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-11-21 23:34:58 +0100 |
commit | 92ad5c2ee4e441b0b366698d77facbf0258e59ad (patch) | |
tree | a67c2840a8b093d4ef583c64f2963f4ecb50c30b /patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atlx_atl2.patch | |
parent | bf4ede990a6d26d93e760d2b98065a4afaaefbd5 (diff) |
backports: refresh on next-20131121backports-20131121
== ckmake-report.log ==
1 2.6.24 [ FAIL ]
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.101 [ OK ]
18 3.1.10 [ OK ]
19 3.10.17 [ OK ]
20 3.11.6 [ OK ]
21 3.12-rc7 [ OK ]
22 3.2.52 [ OK ]
23 3.3.8 [ OK ]
24 3.4.67 [ OK ]
25 3.5.7 [ OK ]
26 3.6.11 [ OK ]
27 3.7.10 [ OK ]
28 3.8.13 [ OK ]
29 3.9.11 [ OK ]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atlx_atl2.patch')
-rw-r--r-- | patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atlx_atl2.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atlx_atl2.patch b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atlx_atl2.patch index 95b77e1b..f2f05c74 100644 --- a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atlx_atl2.patch +++ b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atlx_atl2.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/atheros/atlx/atl2.c +++ b/drivers/net/ethernet/atheros/atlx/atl2.c -@@ -365,6 +365,7 @@ static inline void atl2_irq_disable(stru +@@ -361,6 +361,7 @@ static inline void atl2_irq_disable(stru synchronize_irq(adapter->pdev->irq); } @@ -8,7 +8,7 @@ static void __atl2_vlan_mode(netdev_features_t features, u32 *ctrl) { if (features & NETIF_F_HW_VLAN_CTAG_RX) { -@@ -390,12 +391,16 @@ static void atl2_vlan_mode(struct net_de +@@ -386,12 +387,16 @@ static void atl2_vlan_mode(struct net_de atl2_irq_enable(adapter); } @@ -25,7 +25,7 @@ static netdev_features_t atl2_fix_features(struct net_device *netdev, netdev_features_t features) { -@@ -421,6 +426,7 @@ static int atl2_set_features(struct net_ +@@ -417,6 +422,7 @@ static int atl2_set_features(struct net_ return 0; } @@ -33,7 +33,7 @@ static void atl2_intr_rx(struct atl2_adapter *adapter) { -@@ -1154,7 +1160,9 @@ static void atl2_setup_mac_ctrl(struct a +@@ -1150,7 +1156,9 @@ static void atl2_setup_mac_ctrl(struct a MAC_CTRL_PRMLEN_SHIFT); /* vlan */ @@ -43,7 +43,7 @@ /* filter mode */ value |= MAC_CTRL_BC_EN; -@@ -1319,8 +1327,10 @@ static const struct net_device_ops atl2_ +@@ -1315,8 +1323,10 @@ static const struct net_device_ops atl2_ .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = atl2_set_mac, .ndo_change_mtu = atl2_change_mtu, @@ -54,7 +54,7 @@ .ndo_do_ioctl = atl2_ioctl, .ndo_tx_timeout = atl2_tx_timeout, #ifdef CONFIG_NET_POLL_CONTROLLER -@@ -1417,8 +1427,12 @@ static int atl2_probe(struct pci_dev *pd +@@ -1413,8 +1423,12 @@ static int atl2_probe(struct pci_dev *pd err = -EIO; @@ -67,7 +67,7 @@ /* Init PHY as early as possible due to power saving issue */ atl2_phy_init(&adapter->hw); -@@ -2092,6 +2106,13 @@ static int atl2_nway_reset(struct net_de +@@ -2088,6 +2102,13 @@ static int atl2_nway_reset(struct net_de return 0; } @@ -81,7 +81,7 @@ static const struct ethtool_ops atl2_ethtool_ops = { .get_settings = atl2_get_settings, .set_settings = atl2_set_settings, -@@ -2107,6 +2128,14 @@ static const struct ethtool_ops atl2_eth +@@ -2103,6 +2124,14 @@ static const struct ethtool_ops atl2_eth .get_eeprom_len = atl2_get_eeprom_len, .get_eeprom = atl2_get_eeprom, .set_eeprom = atl2_set_eeprom, |