From 93e7a3335a2e4ba64540a935e85530c34b7c06ab Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Mon, 18 May 2009 14:44:24 -0700 Subject: [PATCH] Update compat.diff Signed-off-by: Luis R. Rodriguez --- compat/compat.diff | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/compat/compat.diff b/compat/compat.diff index 1c05577557d6..d89ea98da5ad 100644 --- a/compat/compat.diff +++ b/compat/compat.diff @@ -403,9 +403,9 @@ rtap_dev->ml_priv = priv; SET_NETDEV_DEV(rtap_dev, priv->dev->dev.parent); ---- a/drivers/net/wireless/mac80211_hwsim.c 2009-04-28 15:35:05.000000000 -0700 -+++ b/drivers/net/wireless/mac80211_hwsim.c 2009-04-28 15:35:06.000000000 -0700 -@@ -734,16 +734,22 @@ +--- a/drivers/net/wireless/mac80211_hwsim.c 2009-05-18 14:35:29.000000000 -0700 ++++ b/drivers/net/wireless/mac80211_hwsim.c 2009-05-18 14:35:29.000000000 -0700 +@@ -744,16 +744,22 @@ .name = "mac80211_hwsim" }; @@ -693,7 +693,7 @@ } --- a/net/wireless/Makefile +++ b/net/wireless/Makefile -@@ -1,11 +1,10 @@ +@@ -1,12 +1,11 @@ -obj-$(CONFIG_WIRELESS_EXT) += wext.o obj-$(CONFIG_CFG80211) += cfg80211.o obj-$(CONFIG_LIB80211) += lib80211.o @@ -703,12 +703,14 @@ -cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o mlme.o ibss.o +cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o mlme.o ibss.o compat.o + cfg80211-$(CONFIG_CFG80211_DEBUGFS) += debugfs.o cfg80211-$(CONFIG_WIRELESS_EXT) += wext-compat.o ccflags-y += -D__CHECK_ENDIAN__ --- a/net/wireless/core.h -+++ b/net/wireless/core.h -@@ -85,7 +85,11 @@ struct cfg80211_internal_bss { +--- a/net/wireless/core.h 2009-05-18 14:36:20.000000000 -0700 ++++ b/net/wireless/core.h 2009-05-18 14:36:20.000000000 -0700 +@@ -97,7 +97,11 @@ struct rb_node rbn; unsigned long ts; struct kref ref; -- 2.30.2