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

Commit 7c254d3d authored by Ivo van Doorn's avatar Ivo van Doorn Committed by James Ketrenos
Browse files

This will move the ieee80211_is_ofdm_rate function to the ieee80211.h 


header, and I also added the ieee80211_is_cck_rate counterpart.

Various drivers currently create there own version of these functions,
but I guess the ieee80211 stack is the best place to provide such
routines.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJames Ketrenos <jketreno@linux.intel.com>
parent 604116a3

include/net/ieee80211.h

+28 −0
Original line number Original line Diff line number Diff line
@@ -1045,6 +1045,34 @@ static inline u8 *ieee80211_get_payload(struct ieee80211_hdr *hdr) 




}

}





static inline int ieee80211_is_ofdm_rate(u8 rate)

{

	switch (rate & ~IEEE80211_BASIC_RATE_MASK) {

	case IEEE80211_OFDM_RATE_6MB:

	case IEEE80211_OFDM_RATE_9MB:

	case IEEE80211_OFDM_RATE_12MB:

	case IEEE80211_OFDM_RATE_18MB:

	case IEEE80211_OFDM_RATE_24MB:

	case IEEE80211_OFDM_RATE_36MB:

	case IEEE80211_OFDM_RATE_48MB:

	case IEEE80211_OFDM_RATE_54MB:

		return 1;

	}

	return 0;

}



static inline int ieee80211_is_cck_rate(u8 rate)

{

	switch (rate & ~IEEE80211_BASIC_RATE_MASK) {

	case IEEE80211_CCK_RATE_1MB:

	case IEEE80211_CCK_RATE_2MB:

	case IEEE80211_CCK_RATE_5MB:

	case IEEE80211_CCK_RATE_11MB:

		return 1;

	}

	return 0;

}



/* ieee80211.c */

/* ieee80211.c */

extern void free_ieee80211(struct net_device *dev);

extern void free_ieee80211(struct net_device *dev);

extern struct net_device *alloc_ieee80211(int sizeof_priv);

extern struct net_device *alloc_ieee80211(int sizeof_priv);

net/ieee80211/ieee80211_rx.c

+0 −16
Original line number Original line Diff line number Diff line
@@ -1020,22 +1020,6 @@ static int ieee80211_handle_assoc_resp(struct ieee80211_device *ieee, struct iee 




/***************************************************/

/***************************************************/





static inline int ieee80211_is_ofdm_rate(u8 rate)

{

	switch (rate & ~IEEE80211_BASIC_RATE_MASK) {

	case IEEE80211_OFDM_RATE_6MB:

	case IEEE80211_OFDM_RATE_9MB:

	case IEEE80211_OFDM_RATE_12MB:

	case IEEE80211_OFDM_RATE_18MB:

	case IEEE80211_OFDM_RATE_24MB:

	case IEEE80211_OFDM_RATE_36MB:

	case IEEE80211_OFDM_RATE_48MB:

	case IEEE80211_OFDM_RATE_54MB:

		return 1;

	}

	return 0;

}



static inline int ieee80211_network_init(struct ieee80211_device *ieee, struct ieee80211_probe_response

static inline int ieee80211_network_init(struct ieee80211_device *ieee, struct ieee80211_probe_response

					 *beacon,

					 *beacon,

					 struct ieee80211_network *network,

					 struct ieee80211_network *network,