Update compat.diff
authorLuis R. Rodriguez <lrodriguez@atheros.com>
Wed, 25 Mar 2009 01:34:26 +0000 (18:34 -0700)
committerLuis R. Rodriguez <lrodriguez@atheros.com>
Wed, 25 Mar 2009 01:34:26 +0000 (18:34 -0700)
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
compat/compat.diff

index d80aba961d89d9abea99f58d67a7f6595e98e5aa..1b6bc128238464ca863b7dc627cd3f7334a7f203 100644 (file)
@@ -271,9 +271,9 @@ index a0c860f..9c6f214 100644
        dev->irq = sdev->irq;
        SET_ETHTOOL_OPS(dev, &b44_ethtool_ops);
  
---- a/net/mac80211/iface.c     2009-03-20 19:55:10.000000000 -0700
-+++ b/net/mac80211/iface.c     2009-03-20 19:55:18.000000000 -0700
-@@ -669,6 +669,7 @@
+--- a/net/mac80211/iface.c     2009-03-24 18:33:11.000000000 -0700
++++ b/net/mac80211/iface.c     2009-03-24 18:33:18.000000000 -0700
+@@ -671,6 +671,7 @@
        WARN_ON(flushed);
  }
  
@@ -281,7 +281,7 @@ index a0c860f..9c6f214 100644
  static const struct net_device_ops ieee80211_dataif_ops = {
        .ndo_open               = ieee80211_open,
        .ndo_stop               = ieee80211_stop,
-@@ -688,11 +689,22 @@
+@@ -690,11 +691,22 @@
        .ndo_change_mtu         = ieee80211_change_mtu,
        .ndo_set_mac_address    = eth_mac_addr,
  };
@@ -304,7 +304,7 @@ index a0c860f..9c6f214 100644
        dev->wireless_handlers = &ieee80211_iw_handler_def;
        dev->destructor = free_netdev;
  }
-@@ -708,7 +720,11 @@
+@@ -710,7 +722,11 @@
  
        /* and set some type-dependent values */
        sdata->vif.type = type;
@@ -316,7 +316,7 @@ index a0c860f..9c6f214 100644
        sdata->wdev.iftype = type;
  
        /* only monitor differs */
-@@ -731,7 +747,11 @@
+@@ -733,7 +749,11 @@
                break;
        case NL80211_IFTYPE_MONITOR:
                sdata->dev->type = ARPHRD_IEEE80211_RADIOTAP;
@@ -328,7 +328,7 @@ index a0c860f..9c6f214 100644
                sdata->u.mntr_flags = MONITOR_FLAG_CONTROL |
                                      MONITOR_FLAG_OTHER_BSS;
                break;
-@@ -838,6 +858,10 @@
+@@ -840,6 +860,10 @@
        if (ret)
                goto fail;