- config_wireless_ext-is-neccessary-after-all.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled

     CONFIG_WIRELESS_EXT is neccessary after all

has been removed from the -mm tree.  Its filename is

     config_wireless_ext-is-neccessary-after-all.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: CONFIG_WIRELESS_EXT is neccessary after all
From: Horms <horms@xxxxxxxxxxxx>


WARNING: /lib/modules/2.6.17-mm2/kernel/net/ieee80211/ieee80211.ko 
needs unknown symbol wireless_spy_update

Someone removed the `#ifdef CONFIG_WIRELESS_EXT' from around the callsite
in net/ieee80211/ieee80211_rx.c and didn't update Kconfig appropriately.



The offending patchset seems to be 35c14b855f52c49e4f3d078b9532b056005ed321
which is tittled

  [PATCH] ieee80211: remove unnecessary CONFIG_WIRELESS_EXT checking

After a quick look it seems that wireless_spy_update() lives in
net/core/wirless.c, and that file is only compiled if CONFIG_WIRELESS_EXT
is set.  Perhaps this is Kconig work, but in the mean time here is a
reversal of the recent change.

Signed-off-by: Horms <horms@xxxxxxxxxxxx>
Cc: "John W. Linville" <linville@xxxxxxxxxxxxx>
Cc: Jeff Garzik <jeff@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 net/ieee80211/ieee80211_rx.c |    2 ++
 1 file changed, 2 insertions(+)

diff -puN net/ieee80211/ieee80211_rx.c~config_wireless_ext-is-neccessary-after-all net/ieee80211/ieee80211_rx.c
--- a/net/ieee80211/ieee80211_rx.c~config_wireless_ext-is-neccessary-after-all
+++ a/net/ieee80211/ieee80211_rx.c
@@ -369,6 +369,7 @@ int ieee80211_rx(struct ieee80211_device
 
 	/* Put this code here so that we avoid duplicating it in all
 	 * Rx paths. - Jean II */
+#ifdef CONFIG_WIRELESS_EXT
 #ifdef IW_WIRELESS_SPY		/* defined in iw_handler.h */
 	/* If spy monitoring on */
 	if (ieee->spy_data.spy_number > 0) {
@@ -397,6 +398,7 @@ int ieee80211_rx(struct ieee80211_device
 		wireless_spy_update(ieee->dev, hdr->addr2, &wstats);
 	}
 #endif				/* IW_WIRELESS_SPY */
+#endif				/* CONFIG_WIRELESS_EXT */
 
 #ifdef NOT_YET
 	hostap_update_rx_stats(local->ap, hdr, rx_stats);
_

Patches currently in -mm which might be from horms@xxxxxxxxxxxx are

git-wireless.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux