admin-update refresh

I did some nasty things to get the patch before to apply, lets
clean that up now so that the patches apply cleanly.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>

diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch
index f6408635ea8cdb4532632c23e4b8ccfb7966f000..856bfe8cdf4824378e9cbcea8933343e617b4fa1 100644 (file)
--- a/patches/01-netdev.patch
+++ b/patches/01-netdev.patch
@@ -8,7 +8,7 @@ without creating a headache on maintenance of the pathes.
 
 --- a/drivers/net/usb/rndis_host.c
 +++ b/drivers/net/usb/rndis_host.c
-@@ -346,7 +346,11 @@
+@@ -346,7 +346,11 @@ generic_rndis_bind(struct usbnet *dev, s
        dev->rx_urb_size &= ~(dev->maxpacket - 1);
        u.init->max_transfer_size = cpu_to_le32(dev->rx_urb_size);
  
@@ -23,7 +23,7 @@ without creating a headache on maintenance of the pathes.
        if (unlikely(retval < 0)) {
 --- a/drivers/net/usb/usbnet.c
 +++ b/drivers/net/usb/usbnet.c
-@@ -1328,7 +1332,7 @@
+@@ -1328,7 +1328,7 @@ usbnet_probe (struct usb_interface *udev
                net->features |= NETIF_F_HIGHDMA;
  #endif
  
@@ -34,7 +34,7 @@ without creating a headache on maintenance of the pathes.
  
 --- a/drivers/net/wireless/rndis_wlan.c
 +++ b/drivers/net/wireless/rndis_wlan.c
-@@ -3105,7 +3105,7 @@
+@@ -3105,7 +3105,7 @@ static int rndis_wlan_bind(struct usbnet
         * rndis_host wants to avoid all OID as much as possible
         * so do promisc/multicast handling in rndis_wlan.
         */
@@ -45,7 +45,7 @@ without creating a headache on maintenance of the pathes.
        retval = rndis_set_oid(usbdev, OID_GEN_CURRENT_PACKET_FILTER, &tmp,
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -723,10 +733,16 @@
+@@ -723,10 +723,16 @@ static const struct net_device_ops ieee8
  static void ieee80211_if_setup(struct net_device *dev)
  {
        ether_setup(dev);
@@ -63,7 +63,7 @@ without creating a headache on maintenance of the pathes.
  /*
   * Helper function to initialise an interface to a specific type.
   */
-@@ -738,7 +754,7 @@
+@@ -738,7 +744,7 @@ static void ieee80211_setup_sdata(struct
  
        /* and set some type-dependent values */
        sdata->vif.type = type;
@@ -72,7 +72,7 @@ without creating a headache on maintenance of the pathes.
        sdata->wdev.iftype = type;
  
        /* only monitor differs */
-@@ -761,7 +777,7 @@
+@@ -761,7 +767,7 @@ static void ieee80211_setup_sdata(struct
                break;
        case NL80211_IFTYPE_MONITOR:
                sdata->dev->type = ARPHRD_IEEE80211_RADIOTAP;
@@ -81,7 +81,7 @@ without creating a headache on maintenance of the pathes.
                sdata->u.mntr_flags = MONITOR_FLAG_CONTROL |
                                      MONITOR_FLAG_OTHER_BSS;
                break;
-@@ -942,6 +958,8 @@
+@@ -942,6 +948,8 @@ int ieee80211_if_add(struct ieee80211_lo
                return -ENOMEM;
        dev_net_set(ndev, wiphy_net(local->hw.wiphy));
  
@@ -90,7 +90,7 @@ without creating a headache on maintenance of the pathes.
        ndev->needed_headroom = local->tx_headroom +
                                4*6 /* four MAC addresses */
                                + 2 + 2 + 2 + 2 /* ctl, dur, seq, qos */
-@@ -950,6 +968,7 @@
+@@ -950,6 +958,7 @@ int ieee80211_if_add(struct ieee80211_lo
                                - ETH_HLEN /* ethernet hard_header_len */
                                + IEEE80211_ENCRYPT_HEADROOM;
        ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM;
@@ -98,7 +98,7 @@ without creating a headache on maintenance of the pathes.
  
        ret = dev_alloc_name(ndev, ndev->name);
        if (ret < 0)
-@@ -995,6 +1014,10 @@
+@@ -995,6 +1004,10 @@ int ieee80211_if_add(struct ieee80211_lo
        if (ret)
                goto fail;
  

diff --git a/patches/14-device-type.patch b/patches/14-device-type.patch
index 4953354e1109c3ed0f087341e53847b1aac4f926..f6ee1d72d64a5036cba64c8f3859900b7c721e43 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
-@@ -1256,13 +1256,17 @@ static const struct net_device_ops usbne
+@@ -1254,13 +1254,17 @@ static const struct net_device_ops usbne
  
  // precondition: never called in_interrupt
  

diff --git a/patches/17-netdev-queue.patch b/patches/17-netdev-queue.patch
index 1d3ceba740a1da0d146c15fe9807b1798b6a625d..1a01160991bc1b09ad3dbcac07b23b3e6da2eb98 100644 (file)
--- a/patches/17-netdev-queue.patch
+++ b/patches/17-netdev-queue.patch
@@ -14,7 +14,7 @@ The patch that introduced this on mac80211 was:
 
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -1065,6 +1065,7 @@ void ieee80211_if_remove(struct ieee8021
+@@ -1044,6 +1044,7 @@ void ieee80211_if_remove(struct ieee8021
   * Remove all interfaces, may only be called at hardware unregistration
   * time because it doesn't do RCU-safe list removals.
   */
@@ -22,7 +22,7 @@ The patch that introduced this on mac80211 was:
  void ieee80211_remove_interfaces(struct ieee80211_local *local)
  {
        struct ieee80211_sub_if_data *sdata, *tmp;
-@@ -1081,6 +1082,22 @@ void ieee80211_remove_interfaces(struct 
+@@ -1060,6 +1061,22 @@ void ieee80211_remove_interfaces(struct 
        mutex_unlock(&local->iflist_mtx);
        unregister_netdevice_many(&unreg_list);
  }