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

Commit 9ba7e0d1 authored by James Ketrenos's avatar James Ketrenos Committed by Jeff Garzik
Browse files

[PATCH] ieee80211: "extern inline" to "static inline" 



tree bce04549ce0a8239d8083d8da5c3d12f7e1aecd9
parent b15a5153d5f1c75d9435d5ce19b52287059d5d54
author Adrian Bunk <bunk@stusta.de> 1125026386 -0500
committer James Ketrenos <jketreno@linux.intel.com> 1127313953 -0500

"extern inline" doesn't make much sense.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarJames Ketrenos <jketreno@linux.intel.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent cdcfc210

include/net/ieee80211.h

+7 −7
Original line number Diff line number Diff line
@@ -929,12 +929,12 @@ struct ieee80211_device { 
#define IEEE_G            (1<<2)

#define IEEE_MODE_MASK    (IEEE_A|IEEE_B|IEEE_G)



extern inline void *ieee80211_priv(struct net_device *dev)

static inline void *ieee80211_priv(struct net_device *dev)

{

	return ((struct ieee80211_device *)netdev_priv(dev))->priv;

}



extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)

static inline int ieee80211_is_empty_essid(const char *essid, int essid_len)

{

	/* Single white space is for Linksys APs */

	if (essid_len == 1 && essid[0] == ' ')
@@ -950,7 +950,7 @@ extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len) 
	return 1;

}



extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee,

static inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee,

					  int mode)

{

	/*
@@ -977,7 +977,7 @@ extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, 
	return 0;

}



extern inline int ieee80211_get_hdrlen(u16 fc)

static inline int ieee80211_get_hdrlen(u16 fc)

{

	int hdrlen = IEEE80211_3ADDR_LEN;

	u16 stype = WLAN_FC_GET_STYPE(fc);
@@ -1005,7 +1005,7 @@ extern inline int ieee80211_get_hdrlen(u16 fc) 
	return hdrlen;

}



extern inline u8 *ieee80211_get_payload(struct ieee80211_hdr *hdr)

static inline u8 *ieee80211_get_payload(struct ieee80211_hdr *hdr)

{

	switch (ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl))) {

	case IEEE80211_1ADDR_LEN:
@@ -1070,12 +1070,12 @@ extern int ieee80211_wx_get_encodeext(struct ieee80211_device *ieee, 
				      union iwreq_data *wrqu, char *extra);

#endif



extern inline void ieee80211_increment_scans(struct ieee80211_device *ieee)

static inline void ieee80211_increment_scans(struct ieee80211_device *ieee)

{

	ieee->scans++;

}



extern inline int ieee80211_get_scans(struct ieee80211_device *ieee)

static inline int ieee80211_get_scans(struct ieee80211_device *ieee)

{

	return ieee->scans;

}