From be6968b10d0086157bfa43ac8988d274da5d0252 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Thu, 14 Jun 2012 15:41:14 -0700 Subject: [PATCH] compat-wireless: refresh patches for next-20120614 Signed-off-by: Luis R. Rodriguez --- patches/0001-netdev_ops.patch | 2 +- patches/14-device-type.patch | 2 +- patches/25-multicast-list_head.patch | 2 +- patches/54-get_ts_info.patch | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/0001-netdev_ops.patch b/patches/0001-netdev_ops.patch index b6a2265d55ee..8f2939959dc8 100644 --- 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 4187e7eae9a3..c26439dc4e43 100644 --- 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 a7ea0c9d0161..639f423f406f 100644 --- 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 5e842dfdbda4..e58ffcc0c383 100644 --- 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, -- 2.30.2