Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 459d4087 authored by Zhu Yi's avatar Zhu Yi Committed by John W. Linville
Browse files

[PATCH] ipw2200: rename CONFIG_IEEE80211_RADIOTAP to CONFIG_IPW2200_RADIOTAP 



Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 34f8ae46

drivers/net/wireless/ipw2200.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -58,7 +58,7 @@ 
#define VP

#define VP

#endif

#endif





#ifdef CONFIG_IEEE80211_RADIOTAP

#ifdef CONFIG_IPW2200_RADIOTAP

#define VR "r"

#define VR "r"

#else

#else

#define VR

#define VR
@@ -7583,7 +7583,7 @@ static void ipw_handle_data_packet(struct ipw_priv *priv, 
	}

	}

}

}





#ifdef CONFIG_IEEE80211_RADIOTAP

#ifdef CONFIG_IPW2200_RADIOTAP

static void ipw_handle_data_packet_monitor(struct ipw_priv *priv,

static void ipw_handle_data_packet_monitor(struct ipw_priv *priv,

					   struct ipw_rx_mem_buffer *rxb,

					   struct ipw_rx_mem_buffer *rxb,

					   struct ieee80211_rx_stats *stats)

					   struct ieee80211_rx_stats *stats)
@@ -8191,7 +8191,7 @@ static void ipw_rx(struct ipw_priv *priv) 




#ifdef CONFIG_IPW2200_MONITOR

#ifdef CONFIG_IPW2200_MONITOR

				if (priv->ieee->iw_mode == IW_MODE_MONITOR) {

				if (priv->ieee->iw_mode == IW_MODE_MONITOR) {

#ifdef CONFIG_IEEE80211_RADIOTAP

#ifdef CONFIG_IPW2200_RADIOTAP





                ipw_handle_data_packet_monitor(priv,

                ipw_handle_data_packet_monitor(priv,

					       rxb,

					       rxb,
@@ -8378,7 +8378,7 @@ static int ipw_sw_reset(struct ipw_priv *priv, int option) 
#ifdef CONFIG_IPW2200_MONITOR

#ifdef CONFIG_IPW2200_MONITOR

	case 2:

	case 2:

		priv->ieee->iw_mode = IW_MODE_MONITOR;

		priv->ieee->iw_mode = IW_MODE_MONITOR;

#ifdef CONFIG_IEEE80211_RADIOTAP

#ifdef CONFIG_IPW2200_RADIOTAP

		priv->net_dev->type = ARPHRD_IEEE80211_RADIOTAP;

		priv->net_dev->type = ARPHRD_IEEE80211_RADIOTAP;

#else

#else

		priv->net_dev->type = ARPHRD_IEEE80211;

		priv->net_dev->type = ARPHRD_IEEE80211;
@@ -8633,7 +8633,7 @@ static int ipw_wx_set_mode(struct net_device *dev, 
		priv->net_dev->type = ARPHRD_ETHER;

		priv->net_dev->type = ARPHRD_ETHER;





	if (wrqu->mode == IW_MODE_MONITOR)

	if (wrqu->mode == IW_MODE_MONITOR)

#ifdef CONFIG_IEEE80211_RADIOTAP

#ifdef CONFIG_IPW2200_RADIOTAP

		priv->net_dev->type = ARPHRD_IEEE80211_RADIOTAP;

		priv->net_dev->type = ARPHRD_IEEE80211_RADIOTAP;

#else

#else

		priv->net_dev->type = ARPHRD_IEEE80211;

		priv->net_dev->type = ARPHRD_IEEE80211;
@@ -9735,7 +9735,7 @@ static int ipw_wx_set_monitor(struct net_device *dev, 
	IPW_DEBUG_WX("SET MONITOR: %d %d\n", enable, parms[1]);

	IPW_DEBUG_WX("SET MONITOR: %d %d\n", enable, parms[1]);

	if (enable) {

	if (enable) {

		if (priv->ieee->iw_mode != IW_MODE_MONITOR) {

		if (priv->ieee->iw_mode != IW_MODE_MONITOR) {

#ifdef CONFIG_IEEE80211_RADIOTAP

#ifdef CONFIG_IPW2200_RADIOTAP

			priv->net_dev->type = ARPHRD_IEEE80211_RADIOTAP;

			priv->net_dev->type = ARPHRD_IEEE80211_RADIOTAP;

#else

#else

			priv->net_dev->type = ARPHRD_IEEE80211;

			priv->net_dev->type = ARPHRD_IEEE80211;

drivers/net/wireless/ipw2200.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -1146,7 +1146,7 @@ struct ipw_prom_priv { 
};

};

#endif

#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

/* Magic struct that slots into the radiotap header -- no reason

 * to build this manually element by element, we can write it much

 * to build this manually element by element, we can write it much

 * more efficiently than we can parse it. ORDER MATTERS HERE

 * more efficiently than we can parse it. ORDER MATTERS HERE