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

Commit 40ec6c54 authored by Andrew Miller's avatar Andrew Miller Committed by Greg Kroah-Hartman
Browse files

Staging: rtl8187se: r8180_wx.c: Cleaned up comments 



Realigned some comments and removed small bit of
old comments that I missed in my last commit

Signed-off-by: default avatarAndrew Miller <amiller@amilx.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e7e298e8

drivers/staging/rtl8187se/r8180_wx.c

+59 −62
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static CHANNEL_LIST DefaultChannelPlan[] = { 
	{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 36, 40, 44, 48, 52, 56, 60, 64}, 21},	/* France. Change to ETSI. */

	{{14, 36, 40, 44, 48, 52, 56, 60, 64}, 9},						/* MKK */

	{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 36, 40, 44, 48, 52, 56, 60, 64}, 22},	/* MKK1	*/

	{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 36, 40, 44, 48, 52, 56, 60, 64}, 21},	/*Israel.						*/

	{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 36, 40, 44, 48, 52, 56, 60, 64}, 21},	/* Israel */

	{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 34, 38, 42, 46}, 17},			/* For 11a , TELEC */

	{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14}, 14}					/* For Global Domain. 1-11:active scan, 12-14 passive scan.*/	/* +YJ, 080626 */

};
@@ -196,7 +196,9 @@ static int r8180_wx_set_mode(struct net_device *dev, struct iw_request_info *a, 
/* YJ,add,080819,for hidden ap */

struct  iw_range_with_scan_capa	{

		/* Informative stuff (to choose between different interface) */



		__u32		throughput; /* To give an idea... */



		/* In theory this value should be the maximum benchmarked

		 * TCP/IP throughput, because with most of these devices the

		 * bit rate is meaningless (overhead an co) to estimate how
@@ -1016,7 +1018,6 @@ static int r8180_wx_set_channelplan(struct net_device *dev, 
			     union iwreq_data *wrqu, char *extra)

{

	struct r8180_priv *priv = ieee80211_priv(dev);

	/* struct ieee80211_device *ieee = netdev_priv(dev); */

	int *val = (int *)extra;

	int i;

	printk("-----in fun %s\n", __func__);
@@ -1105,7 +1106,6 @@ static int r8180_wx_set_auth(struct net_device *dev, 
			     struct iw_request_info *info,

			     union iwreq_data *wrqu, char *extra)

{

	/* printk("====>%s()\n", __func__); */

	struct r8180_priv *priv = ieee80211_priv(dev);

	int ret = 0;
@@ -1357,13 +1357,12 @@ static inline int is_same_network(struct ieee80211_network *src, 
		/* A network is only a duplicate if the channel, BSSID, ESSID

		 * and the capability field (in particular IBSS and BSS) all match.

		 * We treat all <hidden> with the same BSSID and channel

		* as one network		*/

		 * as one network

		 */

		return (((src->ssid_len == dst->ssid_len) || (ieee->iw_mode == IW_MODE_INFRA)) && /* YJ,mod, 080819,for hidden ap */

			/* ((src->ssid_len == dst->ssid_len) && */

			(src->channel == dst->channel) &&

			!memcmp(src->bssid, dst->bssid, ETH_ALEN) &&

			(!memcmp(src->ssid, dst->ssid, src->ssid_len) || (ieee->iw_mode == IW_MODE_INFRA)) &&  /* YJ,mod, 080819,for hidden ap */

			/*!memcmp(src->ssid, dst->ssid, src->ssid_len) && */

			((src->capability & WLAN_CAPABILITY_IBSS) ==

			(dst->capability & WLAN_CAPABILITY_IBSS)) &&

			((src->capability & WLAN_CAPABILITY_BSS) ==
@@ -1376,11 +1375,9 @@ static struct iw_statistics *r8180_get_wireless_stats(struct net_device *dev) 
	struct r8180_priv *priv = ieee80211_priv(dev);

	struct ieee80211_device* ieee = priv->ieee80211;

	struct iw_statistics* wstats = &priv->wstats;

	/* struct ieee80211_network* target = NULL; */

	int tmp_level = 0;

	int tmp_qual = 0;

	int tmp_noise = 0;

	/* unsigned long flag; */



	if (ieee->state < IEEE80211_LINKED)	{

		wstats->qual.qual = 0;