diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-01-01 17:58:13 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-01-18 15:36:12 +0100 |
| commit | 280df74827aa326eb92cb66e13bc2c972dbd2845 (patch) | |
| tree | 437df878840be68c1c64540c0de1a6664ce275e2 /patches/collateral-evolutions/network/64-b44-32bit-stats | |
| parent | 8fe5bcafea5be321f4b3cb7c3cc06878088feced (diff) | |
backports: refresh on next-20131224
manual changes done to:
patches/collateral-evolutions/network/25-multicast-list_head/include_net_mac80211.patch
patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_driver-ops.patch
patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_iface.patch
patches/collateral-evolutions/network/64-b44-32bit-stats/drivers_net_ethernet_broadcom_b44.patch
patches/collateral-evolutions/network/70-umode_t-api-change/drivers_net_wireless_ath_ath9k_debug.patch
1 2.6.25 [ OK ]
2 2.6.26 [ OK ]
3 2.6.27 [ OK ]
4 2.6.28 [ OK ]
5 2.6.29 [ OK ]
6 2.6.30 [ OK ]
7 2.6.31 [ OK ]
8 2.6.32 [ OK ]
9 2.6.33 [ OK ]
10 2.6.34 [ OK ]
11 2.6.35 [ OK ]
12 2.6.36 [ OK ]
13 2.6.37 [ OK ]
14 2.6.38 [ OK ]
15 2.6.39 [ OK ]
16 3.0.101 [ OK ]
17 3.1.10 [ OK ]
18 3.2.54 [ OK ]
19 3.3.8 [ OK ]
20 3.4.77 [ OK ]
21 3.5.7 [ OK ]
22 3.6.11 [ OK ]
23 3.7.10 [ OK ]
24 3.8.13 [ OK ]
25 3.9.11 [ OK ]
26 3.10.27 [ OK ]
27 3.11.10 [ OK ]
28 3.12.8 [ OK ]
29 3.13-rc8 [ OK ]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/64-b44-32bit-stats')
| -rw-r--r-- | patches/collateral-evolutions/network/64-b44-32bit-stats/drivers_net_ethernet_broadcom_b44.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/collateral-evolutions/network/64-b44-32bit-stats/drivers_net_ethernet_broadcom_b44.patch b/patches/collateral-evolutions/network/64-b44-32bit-stats/drivers_net_ethernet_broadcom_b44.patch index bbb8c970..a16ba7d6 100644 --- a/patches/collateral-evolutions/network/64-b44-32bit-stats/drivers_net_ethernet_broadcom_b44.patch +++ b/patches/collateral-evolutions/network/64-b44-32bit-stats/drivers_net_ethernet_broadcom_b44.patch @@ -1,14 +1,14 @@ --- a/drivers/net/ethernet/broadcom/b44.c +++ b/drivers/net/ethernet/broadcom/b44.c -@@ -29,6 +29,7 @@ - #include <linux/dma-mapping.h> +@@ -31,6 +31,7 @@ #include <linux/ssb/ssb.h> #include <linux/slab.h> + #include <linux/phy.h> +#include <linux/u64_stats_sync.h> #include <asm/uaccess.h> #include <asm/io.h> -@@ -1646,10 +1647,17 @@ static int b44_close(struct net_device * +@@ -1670,10 +1671,17 @@ static int b44_close(struct net_device * return 0; } @@ -26,7 +26,7 @@ struct b44_hw_stats *hwstat = &bp->hw_stats; unsigned int start; -@@ -2134,7 +2142,11 @@ static const struct net_device_ops b44_n +@@ -2183,7 +2191,11 @@ static const struct net_device_ops b44_n .ndo_open = b44_open, .ndo_stop = b44_close, .ndo_start_xmit = b44_start_xmit, |