diff options
| author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2008-06-11 13:20:39 -0700 |
|---|---|---|
| committer | Luis R. Rodriguez <lrodriguez@atheros.com> | 2008-06-11 13:20:39 -0700 |
| commit | 67e1ae4e8b729aa6dcff94a5e7513c86a97c58cf (patch) | |
| tree | e20388e479c83eae5fea665688bf0b80b4b4acfa | |
| parent | d5bff2f262f8e440c017920e878ed26c759db7b4 (diff) | |
| download | compat-wireless-2.6-old-67e1ae4e8b729aa6dcff94a5e7513c86a97c58cf.tar.gz | |
Update compat.diff
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
| -rw-r--r-- | compat/compat.diff | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/compat/compat.diff b/compat/compat.diff index cd2b765..42a848e 100644 --- a/compat/compat.diff +++ b/compat/compat.diff @@ -176,9 +176,9 @@ obj-$(CONFIG_LIBERTAS) += libertas/ rtl8180-objs := rtl8180_dev.o rtl8180_rtl8225.o rtl8180_sa2400.o rtl8180_max2820.o rtl8180_grf5101.o ---- a/net/wireless/nl80211.c 2008-02-28 19:54:52.000000000 +0100 -+++ b/net/wireless/nl80211.c 2008-02-28 19:54:53.000000000 +0100 -@@ -1062,7 +1062,7 @@ static int get_vlan(struct nlattr *vlana +--- a/net/wireless/nl80211.c 2008-06-11 13:10:36.000000000 -0700 ++++ b/net/wireless/nl80211.c 2008-06-11 13:10:37.000000000 -0700 +@@ -1065,7 +1065,7 @@ return -ENODEV; if (!(*vlan)->ieee80211_ptr) return -EINVAL; @@ -1019,8 +1019,8 @@ struct ieee80211_tx_stored_packet pending_packet[IEEE80211_MAX_QUEUES]; struct tasklet_struct tx_pending_tasklet; ---- a/net/mac80211/main.c 2008-06-04 00:38:14.000000000 -0700 -+++ b/net/mac80211/main.c 2008-06-05 03:12:04.000000000 -0700 +--- a/net/mac80211/main.c 2008-06-11 13:10:36.000000000 -0700 ++++ b/net/mac80211/main.c 2008-06-11 13:10:37.000000000 -0700 @@ -21,7 +21,9 @@ #include <linux/wireless.h> #include <linux/rtnetlink.h> @@ -1031,7 +1031,7 @@ #include <net/cfg80211.h> #include "ieee80211_i.h" -@@ -959,6 +961,13 @@ +@@ -960,6 +962,13 @@ .cache_update = eth_header_cache_update, }; @@ -1045,7 +1045,7 @@ /* Must not be called for mdev */ void ieee80211_if_setup(struct net_device *dev) { -@@ -970,6 +979,9 @@ +@@ -971,6 +980,9 @@ dev->open = ieee80211_open; dev->stop = ieee80211_stop; dev->destructor = ieee80211_if_free; @@ -1055,7 +1055,7 @@ } /* everything else */ -@@ -1676,7 +1688,12 @@ +@@ -1677,7 +1689,12 @@ mdev->open = ieee80211_master_open; mdev->stop = ieee80211_master_stop; mdev->type = ARPHRD_IEEE80211; |