compat-wireless: refresh patches for next-20120614

Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>

diff --git a/patches/0001-netdev_ops.patch b/patches/0001-netdev_ops.patch
index b6a2265d55eeccc23d963321304a15519be64eab..8f2939959dc86d3a330b7b9defab618276ec9628 100644 (file)
--- a/patches/0001-netdev_ops.patch
+++ b/patches/0001-netdev_ops.patch
@@ -49,7 +49,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
        if (unlikely(retval < 0)) {
 --- a/drivers/net/usb/usbnet.c
 +++ b/drivers/net/usb/usbnet.c
-@@ -1410,7 +1410,7 @@ usbnet_probe (struct usb_interface *udev
+@@ -1404,7 +1404,7 @@ usbnet_probe (struct usb_interface *udev
                net->features |= NETIF_F_HIGHDMA;
  #endif
  

diff --git a/patches/14-device-type.patch b/patches/14-device-type.patch
index 4187e7eae9a3eee979e8d82cea9ecf8dc10c0da2..c26439dc4e431d68c9dc1e2ba5d39636909e4506 100644 (file)
--- a/patches/14-device-type.patch
+++ b/patches/14-device-type.patch
@@ -36,7 +36,7 @@ compile warning.
  {
 --- a/drivers/net/usb/usbnet.c
 +++ b/drivers/net/usb/usbnet.c
-@@ -1325,13 +1325,17 @@ static const struct net_device_ops usbne
+@@ -1321,13 +1321,17 @@ static const struct net_device_ops usbne
  
  // precondition: never called in_interrupt
  

diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch
index a7ea0c9d01615741a530b94d471b1811a9de2ad1..639f423f406f51c08b0cd758d7fbc979acfe8a75 100644 (file)
--- a/patches/25-multicast-list_head.patch
+++ b/patches/25-multicast-list_head.patch
@@ -651,7 +651,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
        }
 --- a/include/net/mac80211.h
 +++ b/include/net/mac80211.h
-@@ -2275,7 +2275,11 @@ struct ieee80211_ops {
+@@ -2280,7 +2280,11 @@ struct ieee80211_ops {
                                 u32 changed);
  
        u64 (*prepare_multicast)(struct ieee80211_hw *hw,

diff --git a/patches/54-get_ts_info.patch b/patches/54-get_ts_info.patch
index 5e842dfdbda4612edb214beb7ea41cf8a7cbf257..e58ffcc0c3832f689116b15d08c9b42c6599f2df 100644 (file)
--- a/patches/54-get_ts_info.patch
+++ b/patches/54-get_ts_info.patch
@@ -27,7 +27,7 @@ Date:   Tue Apr 3 22:59:17 2012 +0000
 
 --- a/drivers/net/usb/usbnet.c
 +++ b/drivers/net/usb/usbnet.c
-@@ -909,7 +909,9 @@ static const struct ethtool_ops usbnet_e
+@@ -906,7 +906,9 @@ static const struct ethtool_ops usbnet_e
        .get_drvinfo            = usbnet_get_drvinfo,
        .get_msglevel           = usbnet_get_msglevel,
        .set_msglevel           = usbnet_set_msglevel,