Skip to contentSkip to conversation

ipw2200: rename CONFIG_IEEE80211_RADIOTAP to CONFIG_IPW2200_RADIOTAP

PATCH In review Zhu Yi 1 participant 1 message Apr 13, 2006

Subsystems (3)
Networking Network drivers Networking drivers (wireless)
lore
Share & tools
lore

Zhu Yi

author
#0 lore raw

PATCH 16/18 ipw2200: rename CONFIG_IEEE80211_RADIOTAP to CONFIG_IPW2200_RADIOTAP

Signed-off-by Zhu Yi <[email protected]>

---

 drivers/net/wireless/ipw2200.c |   12 ++++++------
 drivers/net/wireless/ipw2200.h |    2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

70646d6a1c055a3bbd5b29f471ca49d43c534267

drivers/net/wireless/ipw2200.c +6 -6
index 426f306..62ebec8 100644
@@ -58,7 +58,7 @@
 #define VP
 #endif
 
-#ifdef CONFIG_IEEE80211_RADIOTAP
+#ifdef CONFIG_IPW2200_RADIOTAP
 #define VR "r"
 #else
 #define VR

@@ -7586,7 +7586,7 @@ static void ipw_handle_data_packet(struc
 	}
 }
 
-#ifdef CONFIG_IEEE80211_RADIOTAP
+#ifdef CONFIG_IPW2200_RADIOTAP
 static void ipw_handle_data_packet_monitor(struct ipw_priv *priv,
 					   struct ipw_rx_mem_buffer *rxb,
 					   struct ieee80211_rx_stats *stats)

@@ -8194,7 +8194,7 @@ static void ipw_rx(struct ipw_priv *priv
 
 #ifdef CONFIG_IPW2200_MONITOR
 				if (priv->ieee->iw_mode == IW_MODE_MONITOR) {
-#ifdef CONFIG_IEEE80211_RADIOTAP
+#ifdef CONFIG_IPW2200_RADIOTAP
 
                 ipw_handle_data_packet_monitor(priv,
 					       rxb,

@@ -8381,7 +8381,7 @@ static int ipw_sw_reset(struct ipw_priv 
 #ifdef CONFIG_IPW2200_MONITOR
 	case 2:
 		priv->ieee->iw_mode = IW_MODE_MONITOR;
-#ifdef CONFIG_IEEE80211_RADIOTAP
+#ifdef CONFIG_IPW2200_RADIOTAP
 		priv->net_dev->type = ARPHRD_IEEE80211_RADIOTAP;
 #else
 		priv->net_dev->type = ARPHRD_IEEE80211;

@@ -8636,7 +8636,7 @@ static int ipw_wx_set_mode(struct net_de
 		priv->net_dev->type = ARPHRD_ETHER;
 
 	if (wrqu->mode == IW_MODE_MONITOR)
-#ifdef CONFIG_IEEE80211_RADIOTAP
+#ifdef CONFIG_IPW2200_RADIOTAP
 		priv->net_dev->type = ARPHRD_IEEE80211_RADIOTAP;
 #else
 		priv->net_dev->type = ARPHRD_IEEE80211;

@@ -9738,7 +9738,7 @@ static int ipw_wx_set_monitor(struct net
 	IPW_DEBUG_WX("SET MONITOR: %d %d\n", enable, parms[1]);
 	if (enable) {
 		if (priv->ieee->iw_mode != IW_MODE_MONITOR) {
-#ifdef CONFIG_IEEE80211_RADIOTAP
+#ifdef CONFIG_IPW2200_RADIOTAP
 			priv->net_dev->type = ARPHRD_IEEE80211_RADIOTAP;
 #else
 			priv->net_dev->type = ARPHRD_IEEE80211;
drivers/net/wireless/ipw2200.h +1 -1
index 14fe79a..6044c0b 100644
@@ -1146,7 +1146,7 @@ struct ipw_prom_priv {
 };
 #endif
 
-#if defined(CONFIG_IEEE80211_RADIOTAP) || defined(CONFIG_IPW2200_PROMISCUOUS)
+#if defined(CONFIG_IPW2200_RADIOTAP) || defined(CONFIG_IPW2200_PROMISCUOUS)
 /* Magic struct that slots into the radiotap header -- no reason
  * to build this manually element by element, we can write it much
  * more efficiently than we can parse it. ORDER MATTERS HERE
Signature · 1 line
1.2.6