diff options
author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-05-07 17:01:08 -0700 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-05-08 09:02:09 +0200 |
commit | b0225d5a4857282af7e81a80e1c35e14c87bfb0f (patch) | |
tree | 5f1cd8c9925ef08fbb6259548837d867010791b3 /patches/collateral-evolutions/network/64-b44-32bit-stats/drivers_net_ethernet_broadcom_b44.patch | |
parent | 68ee70bbfaf818704e79790912d2f062a83b0651 (diff) |
backports: refresh patches for next-20130405
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/collateral-evolutions/network/64-b44-32bit-stats/drivers_net_ethernet_broadcom_b44.patch')
-rw-r--r-- | patches/collateral-evolutions/network/64-b44-32bit-stats/drivers_net_ethernet_broadcom_b44.patch | 6 |
1 files changed, 3 insertions, 3 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 53089df0..72e1f654 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,6 +1,6 @@ --- a/drivers/net/ethernet/broadcom/b44.c +++ b/drivers/net/ethernet/broadcom/b44.c -@@ -31,6 +31,7 @@ +@@ -29,6 +29,7 @@ #include <linux/dma-mapping.h> #include <linux/ssb/ssb.h> #include <linux/slab.h> @@ -8,7 +8,7 @@ #include <asm/uaccess.h> #include <asm/io.h> -@@ -1638,10 +1639,17 @@ static int b44_close(struct net_device * +@@ -1636,10 +1637,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; -@@ -2130,7 +2138,11 @@ static const struct net_device_ops b44_n +@@ -2128,7 +2136,11 @@ static const struct net_device_ops b44_n .ndo_open = b44_open, .ndo_stop = b44_close, .ndo_start_xmit = b44_start_xmit, |