From 92ad5c2ee4e441b0b366698d77facbf0258e59ad Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Thu, 21 Nov 2013 17:53:08 +0100 Subject: backports: refresh on next-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 --- .../drivers_net_ethernet_atheros_alx_main.patch | 10 +++++----- .../drivers_net_ethernet_atheros_atl1c_atl1c_main.patch | 12 ++++++------ .../drivers_net_ethernet_atheros_atl1e_atl1e_main.patch | 10 +++++----- .../drivers_net_ethernet_atheros_atlx_atl2.patch | 16 ++++++++-------- .../drivers_net_ethernet_atheros_atlx_atlx.patch | 4 ++-- .../drivers_net_wireless_ath_ath6kl_main.patch | 4 ++-- .../drivers_net_wireless_ath_wil6210_netdev.patch | 2 +- 7 files changed, 29 insertions(+), 29 deletions(-) (limited to 'patches/collateral-evolutions/network/40-netdev-hw-features') 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 5360471a..af387875 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 * +@@ -733,6 +733,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 +@@ -741,6 +742,7 @@ static netdev_features_t alx_fix_feature return features; } @@ -16,7 +16,7 @@ static void alx_netif_stop(struct alx_priv *alx) { -@@ -821,7 +823,17 @@ static int alx_change_mtu(struct net_dev +@@ -817,7 +819,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; -@@ -1180,7 +1192,9 @@ static const struct net_device_ops alx_n +@@ -1176,7 +1188,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 -@@ -1298,7 +1312,11 @@ static int alx_probe(struct pci_dev *pde +@@ -1294,7 +1308,11 @@ static int alx_probe(struct pci_dev *pde } } diff --git a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch index 72d672b4..c2a1f196 100644 --- a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch +++ b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -@@ -496,6 +496,7 @@ static void atl1c_set_rxbufsize(struct a +@@ -492,6 +492,7 @@ static void atl1c_set_rxbufsize(struct a adapter->rx_frag_size = roundup_pow_of_two(head_size); } @@ -8,7 +8,7 @@ static netdev_features_t atl1c_fix_features(struct net_device *netdev, netdev_features_t features) { -@@ -524,6 +525,7 @@ static int atl1c_set_features(struct net +@@ -520,6 +521,7 @@ static int atl1c_set_features(struct net return 0; } @@ -16,7 +16,7 @@ /** * atl1c_change_mtu - Change the Maximum Transfer Unit -@@ -556,8 +558,19 @@ static int atl1c_change_mtu(struct net_d +@@ -552,8 +554,19 @@ static int atl1c_change_mtu(struct net_d netdev->mtu = new_mtu; adapter->hw.max_frame_size = new_mtu; atl1c_set_rxbufsize(adapter, netdev); @@ -36,7 +36,7 @@ atl1c_up(adapter); clear_bit(__AT_RESETTING, &adapter->flags); } -@@ -2497,8 +2510,10 @@ static const struct net_device_ops atl1c +@@ -2493,8 +2506,10 @@ static const struct net_device_ops atl1c .ndo_set_mac_address = atl1c_set_mac_addr, .ndo_set_rx_mode = atl1c_set_multi, .ndo_change_mtu = atl1c_change_mtu, @@ -47,7 +47,7 @@ .ndo_do_ioctl = atl1c_ioctl, .ndo_tx_timeout = atl1c_tx_timeout, .ndo_get_stats = atl1c_get_stats, -@@ -2516,6 +2531,7 @@ static int atl1c_init_netdev(struct net_ +@@ -2512,6 +2527,7 @@ static int atl1c_init_netdev(struct net_ netdev->watchdog_timeo = AT_TX_WATCHDOG; atl1c_set_ethtool_ops(netdev); @@ -55,7 +55,7 @@ /* TODO: add when ready */ netdev->hw_features = NETIF_F_SG | NETIF_F_HW_CSUM | -@@ -2524,6 +2540,14 @@ static int atl1c_init_netdev(struct net_ +@@ -2520,6 +2536,14 @@ static int atl1c_init_netdev(struct net_ NETIF_F_TSO6; netdev->features = netdev->hw_features | NETIF_F_HW_VLAN_CTAG_TX; diff --git a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch index 71d8d653..6927a572 100644 --- a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch +++ b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c +++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c -@@ -403,6 +403,7 @@ static int atl1e_set_mac_addr(struct net +@@ -399,6 +399,7 @@ static int atl1e_set_mac_addr(struct net return 0; } @@ -8,7 +8,7 @@ static netdev_features_t atl1e_fix_features(struct net_device *netdev, netdev_features_t features) { -@@ -432,6 +433,7 @@ static int atl1e_set_features(struct net +@@ -428,6 +429,7 @@ static int atl1e_set_features(struct net return 0; } @@ -16,7 +16,7 @@ /** * atl1e_change_mtu - Change the Maximum Transfer Unit -@@ -1991,7 +1993,11 @@ void atl1e_down(struct atl1e_adapter *ad +@@ -1987,7 +1989,11 @@ void atl1e_down(struct atl1e_adapter *ad * reschedule our watchdog timer */ set_bit(__AT_DOWN, &adapter->flags); @@ -28,7 +28,7 @@ /* reset MAC to disable all RX/TX */ atl1e_reset_hw(&adapter->hw); -@@ -2261,8 +2267,10 @@ static const struct net_device_ops atl1e +@@ -2257,8 +2263,10 @@ static const struct net_device_ops atl1e .ndo_set_rx_mode = atl1e_set_multi, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = atl1e_set_mac_addr, @@ -39,7 +39,7 @@ .ndo_change_mtu = atl1e_change_mtu, .ndo_do_ioctl = atl1e_ioctl, .ndo_tx_timeout = atl1e_tx_timeout, -@@ -2282,12 +2290,17 @@ static int atl1e_init_netdev(struct net_ +@@ -2278,12 +2286,17 @@ static int atl1e_init_netdev(struct net_ netdev->watchdog_timeo = AT_TX_WATCHDOG; atl1e_set_ethtool_ops(netdev); 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, diff --git a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atlx_atlx.patch b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atlx_atlx.patch index 6dd82879..c315e36c 100644 --- a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atlx_atlx.patch +++ b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atlx_atlx.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/atheros/atlx/atlx.c +++ b/drivers/net/ethernet/atheros/atlx/atlx.c -@@ -254,6 +254,7 @@ static void atlx_restore_vlan(struct atl +@@ -250,6 +250,7 @@ static void atlx_restore_vlan(struct atl atlx_vlan_mode(adapter->netdev, adapter->netdev->features); } @@ -8,7 +8,7 @@ static netdev_features_t atlx_fix_features(struct net_device *netdev, netdev_features_t features) { -@@ -279,5 +280,6 @@ static int atlx_set_features(struct net_ +@@ -275,5 +276,6 @@ static int atlx_set_features(struct net_ return 0; } diff --git a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_wireless_ath_ath6kl_main.patch b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_wireless_ath_ath6kl_main.patch index 94e4c4af..f59f6574 100644 --- a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_wireless_ath_ath6kl_main.patch +++ b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_wireless_ath_ath6kl_main.patch @@ -16,7 +16,7 @@ static void ath6kl_set_multicast_list(struct net_device *ndev) { -@@ -1298,7 +1300,9 @@ static const struct net_device_ops ath6k +@@ -1286,7 +1288,9 @@ static const struct net_device_ops ath6k .ndo_stop = ath6kl_close, .ndo_start_xmit = ath6kl_data_tx, .ndo_get_stats = ath6kl_get_stats, @@ -26,7 +26,7 @@ .ndo_set_rx_mode = ath6kl_set_multicast_list, }; -@@ -1315,7 +1319,11 @@ void init_netdev(struct net_device *dev) +@@ -1303,7 +1307,11 @@ void init_netdev(struct net_device *dev) WMI_MAX_TX_META_SZ + ATH6KL_HTC_ALIGN_BYTES, 4); diff --git a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_wireless_ath_wil6210_netdev.patch b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_wireless_ath_wil6210_netdev.patch index 5f3e6362..cdf75c56 100644 --- a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_wireless_ath_wil6210_netdev.patch +++ b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_wireless_ath_wil6210_netdev.patch @@ -2,7 +2,7 @@ +++ b/drivers/net/wireless/ath/wil6210/netdev.c @@ -127,7 +127,9 @@ void *wil_if_alloc(struct device *dev, v - netdev_attach_ops(ndev, &wil_netdev_ops); + ndev->netdev_ops = &wil_netdev_ops; ndev->ieee80211_ptr = wdev; +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) ndev->hw_features = NETIF_F_HW_CSUM | NETIF_F_RXCSUM; -- cgit v1.2.3