Attachment #188087 for bug #262761

Lines 379-383 Link Here

(-)net80211/ieee80211.c (-7 / +7 lines)
379	(IEEE80211_C_IBSS \| IEEE80211_C_HOSTAP \| IEEE80211_C_AHDEMO \| \	379	(IEEE80211_C_IBSS \| IEEE80211_C_HOSTAP \| IEEE80211_C_AHDEMO \| \
380	IEEE80211_C_MONITOR)	380	IEEE80211_C_MONITOR)
381	struct ieee80211vap *vap = dev->priv;	381	struct ieee80211vap *vap = netdev_priv(dev);
382	struct net_device *parent = ic->ic_dev;	382	struct net_device *parent = ic->ic_dev;
383	int err;	383	int err;
Lines 1019-1023 Link Here
1019	ieee80211com_media_status(struct net_device dev, struct ifmediareq imr)	1019	ieee80211com_media_status(struct net_device dev, struct ifmediareq imr)
1020	{	1020	{
1021	struct ieee80211com ic = dev->priv; /XXX*/	1021	struct ieee80211com ic = netdev_priv(dev); /XXX*/
1022		1022
1023	imr->ifm_status = IFM_AVALID;	1023	imr->ifm_status = IFM_AVALID;
Lines 1071-1075 Link Here
1071	ieee80211com_media_change(struct net_device *dev)	1071	ieee80211com_media_change(struct net_device *dev)
1072	{	1072	{
1073	struct ieee80211com ic = dev->priv; /XXX*/	1073	struct ieee80211com ic = netdev_priv(dev); /XXX*/
1074	struct ieee80211vap *vap;	1074	struct ieee80211vap *vap;
1075	struct ifmedia_entry *ime = ic->ic_media.ifm_cur;	1075	struct ifmedia_entry *ime = ic->ic_media.ifm_cur;
Lines 1184-1188 Link Here
1184	ieee80211_media_change(struct net_device *dev)	1184	ieee80211_media_change(struct net_device *dev)
1185	{	1185	{
1186	struct ieee80211vap *vap = dev->priv;	1186	struct ieee80211vap *vap = netdev_priv(dev);
1187	struct ieee80211com *ic = vap->iv_ic;	1187	struct ieee80211com *ic = vap->iv_ic;
1188	struct ifmedia_entry *ime = vap->iv_media.ifm_cur;	1188	struct ifmedia_entry *ime = vap->iv_media.ifm_cur;
Lines 1228-1232 Link Here
1228	ieee80211_media_status(struct net_device dev, struct ifmediareq imr)	1228	ieee80211_media_status(struct net_device dev, struct ifmediareq imr)
1229	{	1229	{
1230	struct ieee80211vap *vap = dev->priv;	1230	struct ieee80211vap *vap = netdev_priv(dev);
1231	struct ieee80211com *ic = vap->iv_ic;	1231	struct ieee80211com *ic = vap->iv_ic;
1232	enum ieee80211_phymode mode;	1232	enum ieee80211_phymode mode;
Lines 1446-1450 Link Here
1446	ieee80211_getstats(struct net_device *dev)	1446	ieee80211_getstats(struct net_device *dev)
1447	{	1447	{
1448	struct ieee80211vap *vap = dev->priv;	1448	struct ieee80211vap *vap = netdev_priv(dev);
1449	struct net_device_stats *stats = &vap->iv_devstats;	1449	struct net_device_stats *stats = &vap->iv_devstats;
1450		1450
Lines 1485-1489 Link Here
1485	ieee80211_set_multicast_list(struct net_device *dev)	1485	ieee80211_set_multicast_list(struct net_device *dev)
1486	{	1486	{
1487	struct ieee80211vap *vap = dev->priv;	1487	struct ieee80211vap *vap = netdev_priv(dev);
1488	struct ieee80211com *ic = vap->iv_ic;	1488	struct ieee80211com *ic = vap->iv_ic;
1489	struct net_device *parent = ic->ic_dev;	1489	struct net_device *parent = ic->ic_dev;

Lines 79-83 Link Here

(-)net80211/ieee80211_wireless.c (-69 / +69 lines)
79	preempt_scan(struct net_device *dev, int max_grace, int max_wait)	79	preempt_scan(struct net_device *dev, int max_grace, int max_wait)
80	{	80	{
81	struct ieee80211vap *vap = dev->priv;	81	struct ieee80211vap *vap = netdev_priv(dev);
82	struct ieee80211com *ic = vap->iv_ic;	82	struct ieee80211com *ic = vap->iv_ic;
83	int total_delay = 0;	83	int total_delay = 0;
Lines 112-116 Link Here
112	ieee80211_iw_getstats(struct net_device *dev)	112	ieee80211_iw_getstats(struct net_device *dev)
113	{	113	{
114	struct ieee80211vap *vap = dev->priv;	114	struct ieee80211vap *vap = netdev_priv(dev);
115	struct iw_statistics *is = &vap->iv_iwstats;	115	struct iw_statistics *is = &vap->iv_iwstats;
116	struct ieee80211com *ic = vap->iv_ic;	116	struct ieee80211com *ic = vap->iv_ic;
Lines 136-140 Link Here
136	char name, char extra)	136	char name, char extra)
137	{	137	{
138	struct ieee80211vap *vap = dev->priv;	138	struct ieee80211vap *vap = netdev_priv(dev);
139	struct ieee80211_channel *c = vap->iv_ic->ic_curchan;	139	struct ieee80211_channel *c = vap->iv_ic->ic_curchan;
140		140
Lines 186-190 Link Here
186	struct iw_request_info info, struct iw_point erq, char *keybuf)	186	struct iw_request_info info, struct iw_point erq, char *keybuf)
187	{	187	{
188	struct ieee80211vap *vap = dev->priv;	188	struct ieee80211vap *vap = netdev_priv(dev);
189	int kid, error;	189	int kid, error;
190	int wepchange = 0;	190	int wepchange = 0;
Lines 290-294 Link Here
290	struct iw_point erq, char key)	290	struct iw_point erq, char key)
291	{	291	{
292	struct ieee80211vap *vap = dev->priv;	292	struct ieee80211vap *vap = netdev_priv(dev);
293	struct ieee80211_key *k;	293	struct ieee80211_key *k;
294	int error, kid;	294	int error, kid;
Lines 334-338 Link Here
334	IFM_IEEE80211_11G \| IFM_IEEE80211_TURBO,	334	IFM_IEEE80211_11G \| IFM_IEEE80211_TURBO,
335	};	335	};
336	struct ieee80211vap *vap = dev->priv;	336	struct ieee80211vap *vap = netdev_priv(dev);
337	struct ieee80211com *ic = vap->iv_ic;	337	struct ieee80211com *ic = vap->iv_ic;
338	struct ifreq ifr;	338	struct ifreq ifr;
Lines 369-373 Link Here
369	struct iw_param rrq, char extra)	369	struct iw_param rrq, char extra)
370	{	370	{
371	struct ieee80211vap *vap = dev->priv;	371	struct ieee80211vap *vap = netdev_priv(dev);
372	struct ifmediareq imr;	372	struct ifmediareq imr;
373	int rate;	373	int rate;
Lines 407-411 Link Here
407	struct iw_param rts, char extra)	407	struct iw_param rts, char extra)
408	{	408	{
409	struct ieee80211vap *vap = dev->priv;	409	struct ieee80211vap *vap = netdev_priv(dev);
410	struct ieee80211com *ic = vap->iv_ic;	410	struct ieee80211com *ic = vap->iv_ic;
411	u16 val;	411	u16 val;
Lines 430-434 Link Here
430	struct iw_param rts, char extra)	430	struct iw_param rts, char extra)
431	{	431	{
432	struct ieee80211vap *vap = dev->priv;	432	struct ieee80211vap *vap = netdev_priv(dev);
433		433
434	rts->value = vap->iv_rtsthreshold;	434	rts->value = vap->iv_rtsthreshold;
Lines 443-447 Link Here
443	struct iw_param rts, char extra)	443	struct iw_param rts, char extra)
444	{	444	{
445	struct ieee80211vap *vap = dev->priv;	445	struct ieee80211vap *vap = netdev_priv(dev);
446	struct ieee80211com *ic = vap->iv_ic;	446	struct ieee80211com *ic = vap->iv_ic;
447	u16 val;	447	u16 val;
Lines 466-470 Link Here
466	struct iw_param rts, char extra)	466	struct iw_param rts, char extra)
467	{	467	{
468	struct ieee80211vap *vap = dev->priv;	468	struct ieee80211vap *vap = netdev_priv(dev);
469		469
470	rts->value = vap->iv_fragthreshold;	470	rts->value = vap->iv_fragthreshold;
Lines 479-483 Link Here
479	struct sockaddr ap_addr, char extra)	479	struct sockaddr ap_addr, char extra)
480	{	480	{
481	struct ieee80211vap *vap = dev->priv;	481	struct ieee80211vap *vap = netdev_priv(dev);
482		482
483	/* NB: should not be set when in AP mode */	483	/* NB: should not be set when in AP mode */
Lines 514-518 Link Here
514	struct sockaddr ap_addr, char extra)	514	struct sockaddr ap_addr, char extra)
515	{	515	{
516	struct ieee80211vap *vap = dev->priv;	516	struct ieee80211vap *vap = netdev_priv(dev);
517		517
518	if (vap->iv_flags & IEEE80211_F_DESBSSID)	518	if (vap->iv_flags & IEEE80211_F_DESBSSID)
Lines 535-539 Link Here
535	struct iw_point data, char nickname)	535	struct iw_point data, char nickname)
536	{	536	{
537	struct ieee80211vap *vap = dev->priv;	537	struct ieee80211vap *vap = netdev_priv(dev);
538		538
539	if (data->length > IEEE80211_NWID_LEN)	539	if (data->length > IEEE80211_NWID_LEN)
Lines 551-555 Link Here
551	struct iw_point data, char nickname)	551	struct iw_point data, char nickname)
552	{	552	{
553	struct ieee80211vap *vap = dev->priv;	553	struct ieee80211vap *vap = netdev_priv(dev);
554		554
555	if (data->length > vap->iv_nicknamelen + 1)	555	if (data->length > vap->iv_nicknamelen + 1)
Lines 660-664 Link Here
660	struct iw_freq freq, char extra)	660	struct iw_freq freq, char extra)
661	{	661	{
662	struct ieee80211vap *vap = dev->priv;	662	struct ieee80211vap *vap = netdev_priv(dev);
663	struct ieee80211com *ic = vap->iv_ic;	663	struct ieee80211com *ic = vap->iv_ic;
664	struct ieee80211_channel c, c2;	664	struct ieee80211_channel c, c2;
Lines 774-778 Link Here
774	struct iw_freq freq, char extra)	774	struct iw_freq freq, char extra)
775	{	775	{
776	struct ieee80211vap *vap = dev->priv;	776	struct ieee80211vap *vap = netdev_priv(dev);
777	struct ieee80211com *ic = vap->iv_ic;	777	struct ieee80211com *ic = vap->iv_ic;
778		778
Lines 815-819 Link Here
815	struct iw_point data, char ssid)	815	struct iw_point data, char ssid)
816	{	816	{
817	struct ieee80211vap *vap = dev->priv;	817	struct ieee80211vap *vap = netdev_priv(dev);
818		818
819	if (vap->iv_opmode == IEEE80211_M_WDS)	819	if (vap->iv_opmode == IEEE80211_M_WDS)
Lines 857-861 Link Here
857	struct iw_point data, char essid)	857	struct iw_point data, char essid)
858	{	858	{
859	struct ieee80211vap *vap = dev->priv;	859	struct ieee80211vap *vap = netdev_priv(dev);
860		860
861	if (vap->iv_opmode == IEEE80211_M_WDS)	861	if (vap->iv_opmode == IEEE80211_M_WDS)
Lines 888-892 Link Here
888	struct iw_point data, char extra)	888	struct iw_point data, char extra)
889	{	889	{
890	struct ieee80211vap *vap = dev->priv;	890	struct ieee80211vap *vap = netdev_priv(dev);
891	struct ieee80211com *ic = vap->iv_ic;	891	struct ieee80211com *ic = vap->iv_ic;
892	struct ieee80211_node *ni = vap->iv_bss;	892	struct ieee80211_node *ni = vap->iv_bss;
Lines 1035-1039 Link Here
1035	{	1035	{
1036	/* save the list of node addresses */	1036	/* save the list of node addresses */
1037	struct ieee80211vap *vap = dev->priv;	1037	struct ieee80211vap *vap = netdev_priv(dev);
1038	struct sockaddr address[IW_MAX_SPY];	1038	struct sockaddr address[IW_MAX_SPY];
1039	unsigned int number = data->length;	1039	unsigned int number = data->length;
Lines 1073-1077 Link Here
1073	* copy out rssi, set updated flag appropriately	1073	* copy out rssi, set updated flag appropriately
1074	*/	1074	*/
1075	struct ieee80211vap *vap = dev->priv;	1075	struct ieee80211vap *vap = netdev_priv(dev);
1076	struct ieee80211_node_table *nt = &vap->iv_ic->ic_sta;	1076	struct ieee80211_node_table *nt = &vap->iv_ic->ic_sta;
1077	struct ieee80211_node *ni;	1077	struct ieee80211_node *ni;
Lines 1119-1123 Link Here
1119	struct iw_point data, char extra)	1119	struct iw_point data, char extra)
1120	{	1120	{
1121	struct ieee80211vap *vap = dev->priv;	1121	struct ieee80211vap *vap = netdev_priv(dev);
1122	struct iw_thrspy threshold;	1122	struct iw_thrspy threshold;
1123		1123
Lines 1156-1160 Link Here
1156	struct iw_point data, char extra)	1156	struct iw_point data, char extra)
1157	{	1157	{
1158	struct ieee80211vap *vap = dev->priv;	1158	struct ieee80211vap *vap = netdev_priv(dev);
1159	struct ieee80211com *ic = vap->iv_ic;	1159	struct ieee80211com *ic = vap->iv_ic;
1160	struct iw_thrspy *threshold;	1160	struct iw_thrspy *threshold;
Lines 1177-1181 Link Here
1177	__u32 mode, char extra)	1177	__u32 mode, char extra)
1178	{	1178	{
1179	struct ieee80211vap *vap = dev->priv;	1179	struct ieee80211vap *vap = netdev_priv(dev);
1180	struct ifmediareq imr;	1180	struct ifmediareq imr;
1181	int valid = 0;	1181	int valid = 0;
Lines 1204-1208 Link Here
1204	__u32 mode, char extra)	1204	__u32 mode, char extra)
1205	{	1205	{
1206	struct ieee80211vap *vap = dev->priv;	1206	struct ieee80211vap *vap = netdev_priv(dev);
1207	struct ifmediareq imr;	1207	struct ifmediareq imr;
1208		1208
Lines 1229-1233 Link Here
1229	struct iw_param wrq, char extra)	1229	struct iw_param wrq, char extra)
1230	{	1230	{
1231	struct ieee80211vap *vap = dev->priv;	1231	struct ieee80211vap *vap = netdev_priv(dev);
1232	struct ieee80211com *ic = vap->iv_ic;	1232	struct ieee80211com *ic = vap->iv_ic;
1233		1233
Lines 1269-1273 Link Here
1269	struct iw_param rrq, char extra)	1269	struct iw_param rrq, char extra)
1270	{	1270	{
1271	struct ieee80211vap *vap = dev->priv;	1271	struct ieee80211vap *vap = netdev_priv(dev);
1272	struct ieee80211com *ic = vap->iv_ic;	1272	struct ieee80211com *ic = vap->iv_ic;
1273		1273
Lines 1293-1297 Link Here
1293	struct iw_param rrq, char extra)	1293	struct iw_param rrq, char extra)
1294	{	1294	{
1295	struct ieee80211vap *vap = dev->priv;	1295	struct ieee80211vap *vap = netdev_priv(dev);
1296	struct ieee80211com *ic = vap->iv_ic;	1296	struct ieee80211com *ic = vap->iv_ic;
1297		1297
Lines 1325-1329 Link Here
1325	struct iw_param rrq, char extra)	1325	struct iw_param rrq, char extra)
1326	{	1326	{
1327	struct ieee80211vap *vap = dev->priv;	1327	struct ieee80211vap *vap = netdev_priv(dev);
1328		1328
1329	rrq->disabled = (vap->iv_flags & IEEE80211_F_SWRETRY) == 0;	1329	rrq->disabled = (vap->iv_flags & IEEE80211_F_SWRETRY) == 0;
Lines 1356-1360 Link Here
1356	struct iw_param rrq, char extra)	1356	struct iw_param rrq, char extra)
1357	{	1357	{
1358	struct ieee80211vap *vap = dev->priv;	1358	struct ieee80211vap *vap = netdev_priv(dev);
1359	struct ieee80211com *ic = vap->iv_ic;	1359	struct ieee80211com *ic = vap->iv_ic;
1360	int fixed, disabled;	1360	int fixed, disabled;
Lines 1411-1415 Link Here
1411	struct iw_param rrq, char extra)	1411	struct iw_param rrq, char extra)
1412	{	1412	{
1413	struct ieee80211vap *vap = dev->priv;	1413	struct ieee80211vap *vap = netdev_priv(dev);
1414	struct ieee80211com *ic = vap->iv_ic;	1414	struct ieee80211com *ic = vap->iv_ic;
1415		1415
Lines 1451-1455 Link Here
1451	struct iw_point data, char extra)	1451	struct iw_point data, char extra)
1452	{	1452	{
1453	struct ieee80211vap *vap = dev->priv;	1453	struct ieee80211vap *vap = netdev_priv(dev);
1454	struct ieee80211com *ic = vap->iv_ic;	1454	struct ieee80211com *ic = vap->iv_ic;
1455	struct waplistreq req; /* XXX off stack */	1455	struct waplistreq req; /* XXX off stack */
Lines 1473-1477 Link Here
1473	struct iw_point data, char extra)	1473	struct iw_point data, char extra)
1474	{	1474	{
1475	struct ieee80211vap *vap = dev->priv;	1475	struct ieee80211vap *vap = netdev_priv(dev);
1476		1476
1477	/*	1477	/*
Lines 1821-1825 Link Here
1821	struct iw_point data, char extra)	1821	struct iw_point data, char extra)
1822	{	1822	{
1823	struct ieee80211vap *vap = dev->priv;	1823	struct ieee80211vap *vap = netdev_priv(dev);
1824	struct ieee80211com *ic = vap->iv_ic;	1824	struct ieee80211com *ic = vap->iv_ic;
1825	struct iwscanreq req;	1825	struct iwscanreq req;
Lines 1923-1927 Link Here
1923	struct iw_point wri, char extra)	1923	struct iw_point wri, char extra)
1924	{	1924	{
1925	struct ieee80211vap *vap = dev->priv;	1925	struct ieee80211vap *vap = netdev_priv(dev);
1926	struct ieee80211com *ic = vap->iv_ic;	1926	struct ieee80211com *ic = vap->iv_ic;
1927	struct ifreq ifr;	1927	struct ifreq ifr;
Lines 2048-2055 Link Here
2048	ieee80211_set_turbo(struct net_device *dev, int flag)	2048	ieee80211_set_turbo(struct net_device *dev, int flag)
2049	{	2049	{
2050	struct ieee80211vap *vap = dev->priv;	2050	struct ieee80211vap *vap = netdev_priv(dev);
2051	struct ieee80211com *ic = vap->iv_ic;	2051	struct ieee80211com *ic = vap->iv_ic;
2052	struct ifreq ifr;	2052	struct ifreq ifr;
2053	struct ieee80211vap *tmpvap = dev->priv;	2053	struct ieee80211vap *tmpvap = netdev_priv(dev);
2054	int nvap = 0;	2054	int nvap = 0;
2055		2055
Lines 2072-2076 Link Here
2072	void w, char extra)	2072	void w, char extra)
2073	{	2073	{
2074	struct ieee80211vap *vap = dev->priv;	2074	struct ieee80211vap *vap = netdev_priv(dev);
2075	struct ieee80211com *ic = vap->iv_ic;	2075	struct ieee80211com *ic = vap->iv_ic;
2076	struct ieee80211_rsnparms *rsn = &vap->iv_bss->ni_rsn;	2076	struct ieee80211_rsnparms *rsn = &vap->iv_bss->ni_rsn;
Lines 2604-2608 Link Here
2604	struct iw_point wri, char extra)	2604	struct iw_point wri, char extra)
2605	{	2605	{
2606	struct ieee80211vap *vap = dev->priv;	2606	struct ieee80211vap *vap = netdev_priv(dev);
2607	struct ieee80211com *ic = vap->iv_ic;	2607	struct ieee80211com *ic = vap->iv_ic;
2608	struct ifmediareq imr;	2608	struct ifmediareq imr;
Lines 2642-2646 Link Here
2642	void w, char extra)	2642	void w, char extra)
2643	{	2643	{
2644	struct ieee80211vap *vap = dev->priv;	2644	struct ieee80211vap *vap = netdev_priv(dev);
2645	struct ieee80211com *ic = vap->iv_ic;	2645	struct ieee80211com *ic = vap->iv_ic;
2646	struct ieee80211_rsnparms *rsn = &vap->iv_bss->ni_rsn;	2646	struct ieee80211_rsnparms *rsn = &vap->iv_bss->ni_rsn;
Lines 2917-2921 Link Here
2917	struct iw_point wri, char extra)	2917	struct iw_point wri, char extra)
2918	{	2918	{
2919	struct ieee80211vap *vap = dev->priv;	2919	struct ieee80211vap *vap = netdev_priv(dev);
2920	void *ie;	2920	void *ie;
2921		2921
Lines 2951-2955 Link Here
2951	struct iw_point wri, char extra)	2951	struct iw_point wri, char extra)
2952	{	2952	{
2953	struct ieee80211vap *vap = dev->priv;	2953	struct ieee80211vap *vap = netdev_priv(dev);
2954		2954
2955	if (vap->iv_opt_ie == NULL) {	2955	if (vap->iv_opt_ie == NULL) {
Lines 3015-3019 Link Here
3015	struct iw_point data, char extra)	3015	struct iw_point data, char extra)
3016	{	3016	{
3017	struct ieee80211vap *vap = dev->priv;	3017	struct ieee80211vap *vap = netdev_priv(dev);
3018	struct ieee80211req_getset_appiebuf *iebuf =	3018	struct ieee80211req_getset_appiebuf *iebuf =
3019	(struct ieee80211req_getset_appiebuf *)extra;	3019	(struct ieee80211req_getset_appiebuf *)extra;
Lines 3057-3061 Link Here
3057	struct iw_point data, char extra)	3057	struct iw_point data, char extra)
3058	{	3058	{
3059	struct ieee80211vap *vap = dev->priv;	3059	struct ieee80211vap *vap = netdev_priv(dev);
3060	struct ieee80211req_getset_appiebuf *iebuf =	3060	struct ieee80211req_getset_appiebuf *iebuf =
3061	(struct ieee80211req_getset_appiebuf *)extra;	3061	(struct ieee80211req_getset_appiebuf *)extra;
Lines 3098-3102 Link Here
3098	void w, char extra)	3098	void w, char extra)
3099	{	3099	{
3100	struct ieee80211vap *vap = dev->priv;	3100	struct ieee80211vap *vap = netdev_priv(dev);
3101	struct ieee80211req_set_filter app_filter = (struct ieee80211req_set_filter )extra;	3101	struct ieee80211req_set_filter app_filter = (struct ieee80211req_set_filter )extra;
3102		3102
Lines 3113-3117 Link Here
3113	void w, char extra)	3113	void w, char extra)
3114	{	3114	{
3115	struct ieee80211vap *vap = dev->priv;	3115	struct ieee80211vap *vap = netdev_priv(dev);
3116	struct ieee80211com *ic = vap->iv_ic;	3116	struct ieee80211com *ic = vap->iv_ic;
3117	struct ieee80211req_key ik = (struct ieee80211req_key )extra;	3117	struct ieee80211req_key ik = (struct ieee80211req_key )extra;
Lines 3182-3186 Link Here
3182	ieee80211_ioctl_getkey(struct net_device dev, struct iwreq iwr)	3182	ieee80211_ioctl_getkey(struct net_device dev, struct iwreq iwr)
3183	{	3183	{
3184	struct ieee80211vap *vap = dev->priv;	3184	struct ieee80211vap *vap = netdev_priv(dev);
3185	struct ieee80211com *ic = vap->iv_ic;	3185	struct ieee80211com *ic = vap->iv_ic;
3186	struct ieee80211_node *ni;	3186	struct ieee80211_node *ni;
Lines 3238-3242 Link Here
3238	void w, char extra)	3238	void w, char extra)
3239	{	3239	{
3240	struct ieee80211vap *vap = dev->priv;	3240	struct ieee80211vap *vap = netdev_priv(dev);
3241	struct ieee80211com *ic = vap->iv_ic;	3241	struct ieee80211com *ic = vap->iv_ic;
3242	struct ieee80211req_del_key dk = (struct ieee80211req_del_key )extra;	3242	struct ieee80211req_del_key dk = (struct ieee80211req_del_key )extra;
Lines 3310-3314 Link Here
3310	void w, char extra)	3310	void w, char extra)
3311	{	3311	{
3312	struct ieee80211vap *vap = dev->priv;	3312	struct ieee80211vap *vap = netdev_priv(dev);
3313	struct ieee80211com *ic = vap->iv_ic;	3313	struct ieee80211com *ic = vap->iv_ic;
3314	struct ieee80211req_mlme mlme = (struct ieee80211req_mlme )extra;	3314	struct ieee80211req_mlme mlme = (struct ieee80211req_mlme )extra;
Lines 3406-3410 Link Here
3406	void w, char extra)	3406	void w, char extra)
3407	{	3407	{
3408	struct ieee80211vap *vap = dev->priv;	3408	struct ieee80211vap *vap = netdev_priv(dev);
3409	struct sockaddr sa = (struct sockaddr )extra;	3409	struct sockaddr sa = (struct sockaddr )extra;
3410	struct ieee80211com *ic = vap->iv_ic;	3410	struct ieee80211com *ic = vap->iv_ic;
Lines 3433-3437 Link Here
3433	void w, char extra)	3433	void w, char extra)
3434	{	3434	{
3435	struct ieee80211vap *vap = dev->priv;	3435	struct ieee80211vap *vap = netdev_priv(dev);
3436	struct sockaddr sa = (struct sockaddr )extra;	3436	struct sockaddr sa = (struct sockaddr )extra;
3437	struct ieee80211com *ic = vap->iv_ic;	3437	struct ieee80211com *ic = vap->iv_ic;
Lines 3483-3487 Link Here
3483	void w, char extra)	3483	void w, char extra)
3484	{	3484	{
3485	struct ieee80211vap *vap = dev->priv;	3485	struct ieee80211vap *vap = netdev_priv(dev);
3486	struct sockaddr sa = (struct sockaddr )extra;	3486	struct sockaddr sa = (struct sockaddr )extra;
3487	const struct ieee80211_aclator *acl = vap->iv_acl;	3487	const struct ieee80211_aclator *acl = vap->iv_acl;
Lines 3501-3505 Link Here
3501	void w, char extra)	3501	void w, char extra)
3502	{	3502	{
3503	struct ieee80211vap *vap = dev->priv;	3503	struct ieee80211vap *vap = netdev_priv(dev);
3504	struct sockaddr sa = (struct sockaddr )extra;	3504	struct sockaddr sa = (struct sockaddr )extra;
3505	const struct ieee80211_aclator *acl = vap->iv_acl;	3505	const struct ieee80211_aclator *acl = vap->iv_acl;
Lines 3519-3523 Link Here
3519	struct iw_request_info info, void w, char *extra)	3519	struct iw_request_info info, void w, char *extra)
3520	{	3520	{
3521	struct ieee80211vap *vap = dev->priv;	3521	struct ieee80211vap *vap = netdev_priv(dev);
3522	struct ieee80211com *ic = vap->iv_ic;	3522	struct ieee80211com *ic = vap->iv_ic;
3523	struct ieee80211req_chanlist *list =	3523	struct ieee80211req_chanlist *list =
Lines 3561-3565 Link Here
3561	struct iw_request_info info, void w, char *extra)	3561	struct iw_request_info info, void w, char *extra)
3562	{	3562	{
3563	struct ieee80211vap *vap = dev->priv;	3563	struct ieee80211vap *vap = netdev_priv(dev);
3564	struct ieee80211com *ic = vap->iv_ic;	3564	struct ieee80211com *ic = vap->iv_ic;
3565		3565
Lines 3572-3576 Link Here
3572	struct iw_request_info info, void w, char *extra)	3572	struct iw_request_info info, void w, char *extra)
3573	{	3573	{
3574	struct ieee80211vap *vap = dev->priv;	3574	struct ieee80211vap *vap = netdev_priv(dev);
3575	struct ieee80211com *ic = vap->iv_ic;	3575	struct ieee80211com *ic = vap->iv_ic;
3576	struct ieee80211req_chaninfo *chans =	3576	struct ieee80211req_chaninfo *chans =
Lines 3616-3620 Link Here
3616	struct iw_request_info info, void w, char *extra)	3616	struct iw_request_info info, void w, char *extra)
3617	{	3617	{
3618	struct ieee80211vap *vap = dev->priv;	3618	struct ieee80211vap *vap = netdev_priv(dev);
3619	int param = (int ) extra;	3619	int param = (int ) extra;
3620	int ac = (param[1] >= 0 && param[1] < WME_NUM_AC) ?	3620	int ac = (param[1] >= 0 && param[1] < WME_NUM_AC) ?
Lines 3705-3709 Link Here
3705	struct iw_request_info info, void w, char *extra)	3705	struct iw_request_info info, void w, char *extra)
3706	{	3706	{
3707	struct ieee80211vap *vap = dev->priv;	3707	struct ieee80211vap *vap = netdev_priv(dev);
3708	int param = (int ) extra;	3708	int param = (int ) extra;
3709	int ac = (param[1] >= 0 && param[1] < WME_NUM_AC) ?	3709	int ac = (param[1] >= 0 && param[1] < WME_NUM_AC) ?
Lines 3741-3745 Link Here
3741	ieee80211_ioctl_getwpaie(struct net_device dev, struct iwreq iwr)	3741	ieee80211_ioctl_getwpaie(struct net_device dev, struct iwreq iwr)
3742	{	3742	{
3743	struct ieee80211vap *vap = dev->priv;	3743	struct ieee80211vap *vap = netdev_priv(dev);
3744	struct ieee80211com *ic = vap->iv_ic;	3744	struct ieee80211com *ic = vap->iv_ic;
3745	struct ieee80211_node *ni;	3745	struct ieee80211_node *ni;
Lines 3774-3778 Link Here
3774	ieee80211_ioctl_getstastats(struct net_device dev, struct iwreq iwr)	3774	ieee80211_ioctl_getstastats(struct net_device dev, struct iwreq iwr)
3775	{	3775	{
3776	struct ieee80211vap *vap = dev->priv;	3776	struct ieee80211vap *vap = netdev_priv(dev);
3777	struct ieee80211com *ic = vap->iv_ic;	3777	struct ieee80211com *ic = vap->iv_ic;
3778	struct ieee80211_node *ni;	3778	struct ieee80211_node *ni;
Lines 3892-3896 Link Here
3892	ieee80211_ioctl_getscanresults(struct net_device dev, struct iwreq iwr)	3892	ieee80211_ioctl_getscanresults(struct net_device dev, struct iwreq iwr)
3893	{	3893	{
3894	struct ieee80211vap *vap = dev->priv;	3894	struct ieee80211vap *vap = netdev_priv(dev);
3895	struct ieee80211com *ic = vap->iv_ic;	3895	struct ieee80211com *ic = vap->iv_ic;
3896	struct scanreq req;	3896	struct scanreq req;
Lines 4050-4054 Link Here
4050	ieee80211_ioctl_getstainfo(struct net_device dev, struct iwreq iwr)	4050	ieee80211_ioctl_getstainfo(struct net_device dev, struct iwreq iwr)
4051	{	4051	{
4052	struct ieee80211vap *vap = dev->priv;	4052	struct ieee80211vap *vap = netdev_priv(dev);
4053	struct ieee80211com *ic = vap->iv_ic;	4053	struct ieee80211com *ic = vap->iv_ic;
4054	struct stainforeq req;	4054	struct stainforeq req;
Lines 4084-4088 Link Here
4084	static void	4084	static void
4085	pre_announced_chanswitch(struct net_device *dev, u_int32_t channel, u_int32_t tbtt) {	4085	pre_announced_chanswitch(struct net_device *dev, u_int32_t channel, u_int32_t tbtt) {
4086	struct ieee80211vap *vap = dev->priv;	4086	struct ieee80211vap *vap = netdev_priv(dev);
4087	struct ieee80211com *ic = vap->iv_ic;	4087	struct ieee80211com *ic = vap->iv_ic;
4088	/* now flag the beacon update to include the channel switch IE */	4088	/* now flag the beacon update to include the channel switch IE */
Lines 4096-4100 Link Here
4096	void w, char extra)	4096	void w, char extra)
4097	{	4097	{
4098	struct ieee80211vap *vap = dev->priv;	4098	struct ieee80211vap *vap = netdev_priv(dev);
4099	struct ieee80211com *ic = vap->iv_ic;	4099	struct ieee80211com *ic = vap->iv_ic;
4100	int param = (int ) extra;	4100	int param = (int ) extra;
Lines 4141-4145 Link Here
4141	struct iw_request_info info, struct iw_point out, char *buf)	4141	struct iw_request_info info, struct iw_point out, char *buf)
4142	{	4142	{
4143	struct ieee80211vap *vap = dev->priv;	4143	struct ieee80211vap *vap = netdev_priv(dev);
4144		4144
4145	if (out->length < vap->iv_opt_ie_len)	4145	if (out->length < vap->iv_opt_ie_len)
Lines 4674-4678 Link Here
4674	struct iw_request_info info, struct iw_point erq, char *extra)	4674	struct iw_request_info info, struct iw_point erq, char *extra)
4675	{	4675	{
4676	struct ieee80211vap *vap = dev->priv;	4676	struct ieee80211vap *vap = netdev_priv(dev);
4677	struct iw_encode_ext *ext;	4677	struct iw_encode_ext *ext;
4678	struct ieee80211_key *wk;	4678	struct ieee80211_key *wk;
Lines 4734-4738 Link Here
4734	struct iw_request_info info, struct iw_point erq, char *extra)	4734	struct iw_request_info info, struct iw_point erq, char *extra)
4735	{	4735	{
4736	struct ieee80211vap *vap = dev->priv;	4736	struct ieee80211vap *vap = netdev_priv(dev);
4737	struct iw_encode_ext ext = (struct iw_encode_ext )extra;	4737	struct iw_encode_ext ext = (struct iw_encode_ext )extra;
4738	struct ieee80211req_key kr;	4738	struct ieee80211req_key kr;
Lines 5318-5322 Link Here
5318	ieee80211_ioctl(struct net_device dev, struct ifreq ifr, int cmd)	5318	ieee80211_ioctl(struct net_device dev, struct ifreq ifr, int cmd)
5319	{	5319	{
5320	struct ieee80211vap *vap = dev->priv;	5320	struct ieee80211vap *vap = netdev_priv(dev);
5321	u_int unit;	5321	u_int unit;
5322		5322

Lines 201-205 Link Here

(-)net80211/ieee80211_output.c (-2 / +2 lines)
201	ieee80211_hardstart(struct sk_buff skb, struct net_device dev)	201	ieee80211_hardstart(struct sk_buff skb, struct net_device dev)
202	{	202	{
203	struct ieee80211vap *vap = dev->priv;	203	struct ieee80211vap *vap = netdev_priv(dev);
204	struct ieee80211com *ic = vap->iv_ic;	204	struct ieee80211com *ic = vap->iv_ic;
205	struct net_device *parent = ic->ic_dev;	205	struct net_device *parent = ic->ic_dev;
Lines 305-309 Link Here
305		305
306	void ieee80211_parent_queue_xmit(struct sk_buff *skb) {	306	void ieee80211_parent_queue_xmit(struct sk_buff *skb) {
307	struct ieee80211vap *vap = skb->dev->priv;	307	struct ieee80211vap *vap = netdev_priv(skb->dev);
308		308
309	vap->iv_devstats.tx_packets++;	309	vap->iv_devstats.tx_packets++;

Lines 141-145 Link Here

(-)net80211/ieee80211_linux.c (-8 / +8 lines)
141	ieee80211_vlan_register(struct net_device dev, struct vlan_group grp)	141	ieee80211_vlan_register(struct net_device dev, struct vlan_group grp)
142	{	142	{
143	struct ieee80211vap *vap = dev->priv;	143	struct ieee80211vap *vap = netdev_priv(dev);
144		144
145	vap->iv_vlgrp = grp;	145	vap->iv_vlgrp = grp;
Lines 152-156 Link Here
152	ieee80211_vlan_add_vid(struct net_device *dev, unsigned short vid)	152	ieee80211_vlan_add_vid(struct net_device *dev, unsigned short vid)
153	{	153	{
154	struct ieee80211vap *vap = dev->priv;	154	struct ieee80211vap *vap = netdev_priv(dev);
155		155
156	if (vap->iv_vlgrp != NULL)	156	if (vap->iv_vlgrp != NULL)
Lines 164-168 Link Here
164	ieee80211_vlan_kill_vid(struct net_device *dev, unsigned short vid)	164	ieee80211_vlan_kill_vid(struct net_device *dev, unsigned short vid)
165	{	165	{
166	struct ieee80211vap *vap = dev->priv;	166	struct ieee80211vap *vap = netdev_priv(dev);
167		167
168	if (vap->iv_vlgrp != NULL)	168	if (vap->iv_vlgrp != NULL)
Lines 334-338 Link Here
334	ieee80211_load_module(const char *modname)	334	ieee80211_load_module(const char *modname)
335	{	335	{
336	#ifdef CONFIG_KMOD	336	#if defined(CONFIG_KMOD) \|\| (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))
337	int rv;	337	int rv;
338	rv = request_module("%s", modname);	338	rv = request_module("%s", modname);
Lines 341-349 Link Here
341	"errno: %d\n", modname, rv);	341	"errno: %d\n", modname, rv);
342	return rv;	342	return rv;
343	#else /* CONFIG_KMOD */	343	#else /* CONFIG_KMOD \|\| 2.6.27+ */
344	printk(KERN_ERR "Unable to load needed module: %s; no support for " \	344	printk(KERN_ERR "Unable to load needed module: %s; no support for " \
345	"automatic module loading", modname );	345	"automatic module loading", modname );
346	return -ENOSYS;	346	return -ENOSYS;
347	#endif /* CONFIG_KMOD */	347	#endif /* CONFIG_KMOD \|\| 2.6.27+ */
348	}	348	}
349		349
Lines 900-905 Link Here
900	switch (event) {	900	switch (event) {
901	case NETDEV_CHANGENAME:	901	case NETDEV_CHANGENAME:
902	ieee80211_sysctl_vdetach(dev->priv);	902	ieee80211_sysctl_vdetach(netdev_priv(dev));
903	ieee80211_sysctl_vattach(dev->priv);	903	ieee80211_sysctl_vattach(netdev_priv(dev));
904	return NOTIFY_DONE;	904	return NOTIFY_DONE;
905	default:	905	default:

Lines 947-951 Link Here

(-)net80211/ieee80211_proto.c (-2 / +2 lines)
947	#define IS_RUNNING(_dev) \	947	#define IS_RUNNING(_dev) \
948	((_dev->flags & (IFF_RUNNING\|IFF_UP)) == (IFF_RUNNING\|IFF_UP))	948	((_dev->flags & (IFF_RUNNING\|IFF_UP)) == (IFF_RUNNING\|IFF_UP))
949	struct ieee80211vap *vap = dev->priv;	949	struct ieee80211vap *vap = netdev_priv(dev);
950	struct ieee80211com *ic = vap->iv_ic;	950	struct ieee80211com *ic = vap->iv_ic;
951	struct net_device *parent = ic->ic_dev;	951	struct net_device *parent = ic->ic_dev;
Lines 1044-1048 Link Here
1044	ieee80211_stop(struct net_device *dev)	1044	ieee80211_stop(struct net_device *dev)
1045	{	1045	{
1046	struct ieee80211vap *vap = dev->priv;	1046	struct ieee80211vap *vap = netdev_priv(dev);
1047	struct ieee80211com *ic = vap->iv_ic;	1047	struct ieee80211com *ic = vap->iv_ic;
1048	struct net_device *parent = ic->ic_dev;	1048	struct net_device *parent = ic->ic_dev;

Lines 154-157 Link Here

(-)include/compat.h (+4 lines)
154	#endif	154	#endif
155		155
		156	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,27)
		157	#define netdev_priv(_netdev) ((_netdev)->priv)
		158	#endif
		159
156	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)	160	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
157	#define skb_end_pointer(_skb) ((_skb)->end)	161	#define skb_end_pointer(_skb) ((_skb)->end)

Lines 290-294 Link Here

(-)ath_rate/onoe/onoe.c (-2 / +2 lines)
290	ath_rate_cb(void arg, struct ieee80211_node ni)	290	ath_rate_cb(void arg, struct ieee80211_node ni)
291	{	291	{
292	ath_rate_update(ni->ni_ic->ic_dev->priv, ni, (long) arg);	292	ath_rate_update(netdev_priv(ni->ni_ic->ic_dev), ni, (long) arg);
293	}	293	}
294		294
Lines 300-304 Link Here
300	{	300	{
301	struct ieee80211com *ic = vap->iv_ic;	301	struct ieee80211com *ic = vap->iv_ic;
302	struct ath_softc *sc = ic->ic_dev->priv;	302	struct ath_softc *sc = netdev_priv(ic->ic_dev);
303	struct ieee80211_node *ni;	303	struct ieee80211_node *ni;
304		304

Lines 304-308 Link Here

(-)ath_rate/amrr/amrr.c (-3 / +3 lines)
304	ath_rate_cb(void arg, struct ieee80211_node ni)	304	ath_rate_cb(void arg, struct ieee80211_node ni)
305	{	305	{
306	ath_rate_update(ni->ni_ic->ic_dev->priv, ni, (long) arg);	306	ath_rate_update(netdev_priv(ni->ni_ic->ic_dev), ni, (long) arg);
307	}	307	}
308		308
Lines 314-318 Link Here
314	{	314	{
315	struct ieee80211com *ic = vap->iv_ic;	315	struct ieee80211com *ic = vap->iv_ic;
316	struct ath_softc *sc = ic->ic_dev->priv;	316	struct ath_softc *sc = netdev_priv(ic->ic_dev);
317	struct amrr_softc asc = (struct amrr_softc ) sc->sc_rc;	317	struct amrr_softc asc = (struct amrr_softc ) sc->sc_rc;
318	struct ieee80211_node *ni;	318	struct ieee80211_node *ni;
Lines 426-430 Link Here
426	{	426	{
427	struct net_device dev = (struct net_device )data;	427	struct net_device dev = (struct net_device )data;
428	struct ath_softc *sc = dev->priv;	428	struct ath_softc *sc = netdev_priv(dev);
429	struct amrr_softc asc = (struct amrr_softc )sc->sc_rc;	429	struct amrr_softc asc = (struct amrr_softc )sc->sc_rc;
430	struct ieee80211com *ic = &sc->sc_ic;	430	struct ieee80211com *ic = &sc->sc_ic;

Lines 883-887 Link Here

(-)ath_rate/sample/sample.c (-2 / +2 lines)
883	ath_rate_cb(void arg, struct ieee80211_node ni)	883	ath_rate_cb(void arg, struct ieee80211_node ni)
884	{	884	{
885	ath_rate_ctl_reset(ni->ni_ic->ic_dev->priv, ni);	885	ath_rate_ctl_reset(netdev_priv(ni->ni_ic->ic_dev), ni);
886	}	886	}
887		887
Lines 901-905 Link Here
901	ieee80211_iterate_nodes(&ic->ic_sta, ath_rate_cb, NULL);	901	ieee80211_iterate_nodes(&ic->ic_sta, ath_rate_cb, NULL);
902	}	902	}
903	ath_rate_newassoc(ic->ic_dev->priv, ATH_NODE(vap->iv_bss), 1);	903	ath_rate_newassoc(netdev_priv(ic->ic_dev), ATH_NODE(vap->iv_bss), 1);
904	}	904	}
905	}	905	}

Lines 737-741 Link Here

(-)ath_rate/minstrel/minstrel.c (-3 / +3 lines)
737	ath_rate_cb(void arg, struct ieee80211_node ni)	737	ath_rate_cb(void arg, struct ieee80211_node ni)
738	{	738	{
739	ath_rate_ctl_reset(ni->ni_ic->ic_dev->priv, ni);	739	ath_rate_ctl_reset(netdev_priv(ni->ni_ic->ic_dev), ni);
740	}	740	}
741		741
Lines 751-755 Link Here
751	ieee80211_iterate_nodes(&ic->ic_sta, ath_rate_cb, NULL);	751	ieee80211_iterate_nodes(&ic->ic_sta, ath_rate_cb, NULL);
752	}	752	}
753	ath_rate_newassoc(ic->ic_dev->priv, ATH_NODE(vap->iv_bss), 1);	753	ath_rate_newassoc(netdev_priv(ic->ic_dev), ATH_NODE(vap->iv_bss), 1);
754	}	754	}
755	}	755	}
Lines 936-940 Link Here
936	unsigned int x = 0;	936	unsigned int x = 0;
937	unsigned int this_tp, this_prob, this_eprob;	937	unsigned int this_tp, this_prob, this_eprob;
938	struct ath_softc *sc = vap->iv_ic->ic_dev->priv;;	938	struct ath_softc *sc = netdev_priv(vap->iv_ic->ic_dev);
939		939
940	TAILQ_FOREACH(ni, &nt->nt_node, ni_list) {	940	TAILQ_FOREACH(ni, &nt->nt_node, ni_list) {

Lines 322-326 Link Here

(-)ath/if_ath_ahb.c (-1 / +1 lines)
322	goto bad2;	322	goto bad2;
323	}	323	}
324	sc = dev->priv;	324	sc = netdev_priv(dev);
325	sc->aps_sc.sc_dev = dev;	325	sc->aps_sc.sc_dev = dev;
326		326

Lines 213-217 Link Here

(-)ath/if_ath_pci.c (-4 / +4 lines)
213	goto bad2;	213	goto bad2;
214	}	214	}
215	sc = dev->priv;	215	sc = netdev_priv(dev);
216	sc->aps_sc.sc_dev = dev;	216	sc->aps_sc.sc_dev = dev;
217	sc->aps_sc.sc_iobase = mem;	217	sc->aps_sc.sc_iobase = mem;
Lines 294-298 Link Here
294	{	294	{
295	struct net_device *dev = pci_get_drvdata(pdev);	295	struct net_device *dev = pci_get_drvdata(pdev);
296	struct ath_pci_softc *sc = dev->priv;	296	struct ath_pci_softc *sc = netdev_priv(dev);
297		297
298	ath_detach(dev);	298	ath_detach(dev);
Lines 312-316 Link Here
312		312
313	ath_suspend(dev);	313	ath_suspend(dev);
314	PCI_SAVE_STATE(pdev, ((struct ath_pci_softc *)dev->priv)->aps_pmstate);	314	PCI_SAVE_STATE(pdev, ((struct ath_pci_softc *)netdev_priv(dev))->aps_pmstate);
315	pci_disable_device(pdev);	315	pci_disable_device(pdev);
316	return pci_set_power_state(pdev, PCI_D3hot);	316	return pci_set_power_state(pdev, PCI_D3hot);
Lines 329-333 Link Here
329		329
330	/* XXX - Should this return nonzero on fail? */	330	/* XXX - Should this return nonzero on fail? */
331	PCI_RESTORE_STATE(pdev, ((struct ath_pci_softc *)dev->priv)->aps_pmstate);	331	PCI_RESTORE_STATE(pdev, ((struct ath_pci_softc *)netdev_priv(dev))->aps_pmstate);
332		332
333	err = pci_enable_device(pdev);	333	err = pci_enable_device(pdev);

Lines 400-404 Link Here

(-)ath/if_ath.c (-64 / +64 lines)
400	ath_attach(u_int16_t devid, struct net_device *dev, HAL_BUS_TAG tag)	400	ath_attach(u_int16_t devid, struct net_device *dev, HAL_BUS_TAG tag)
401	{	401	{
402	struct ath_softc *sc = dev->priv;	402	struct ath_softc *sc = netdev_priv(dev);
403	struct ieee80211com *ic = &sc->sc_ic;	403	struct ieee80211com *ic = &sc->sc_ic;
404	struct ath_hal *ah;	404	struct ath_hal *ah;
Lines 956-960 Link Here
956	ath_detach(struct net_device *dev)	956	ath_detach(struct net_device *dev)
957	{	957	{
958	struct ath_softc *sc = dev->priv;	958	struct ath_softc *sc = netdev_priv(dev);
959	struct ath_hal *ah = sc->sc_ah;	959	struct ath_hal *ah = sc->sc_ah;
960		960
Lines 1012-1016 Link Here
1012	int opmode, int flags, struct net_device *mdev)	1012	int opmode, int flags, struct net_device *mdev)
1013	{	1013	{
1014	struct ath_softc *sc = ic->ic_dev->priv;	1014	struct ath_softc *sc = netdev_priv(ic->ic_dev);
1015	struct ath_hal *ah = sc->sc_ah;	1015	struct ath_hal *ah = sc->sc_ah;
1016	struct net_device *dev;	1016	struct net_device *dev;
Lines 1082-1086 Link Here
1082	}	1082	}
1083		1083
1084	avp = dev->priv;	1084	avp = netdev_priv(dev);
1085	ieee80211_vap_setup(ic, dev, name, unit, opmode, flags);	1085	ieee80211_vap_setup(ic, dev, name, unit, opmode, flags);
1086	/* override with driver methods */	1086	/* override with driver methods */
Lines 1246-1250 Link Here
1246	{	1246	{
1247	struct net_device *dev = vap->iv_ic->ic_dev;	1247	struct net_device *dev = vap->iv_ic->ic_dev;
1248	struct ath_softc *sc = dev->priv;	1248	struct ath_softc *sc = netdev_priv(dev);
1249	struct ath_hal *ah = sc->sc_ah;	1249	struct ath_hal *ah = sc->sc_ah;
1250	struct ath_vap *avp = ATH_VAP(vap);	1250	struct ath_vap *avp = ATH_VAP(vap);
Lines 1348-1352 Link Here
1348	ath_suspend(struct net_device *dev)	1348	ath_suspend(struct net_device *dev)
1349	{	1349	{
1350	struct ath_softc *sc = dev->priv;	1350	struct ath_softc *sc = netdev_priv(dev);
1351		1351
1352	DPRINTF(sc, ATH_DEBUG_ANY, "%s: flags %x\n", __func__, dev->flags);	1352	DPRINTF(sc, ATH_DEBUG_ANY, "%s: flags %x\n", __func__, dev->flags);
Lines 1357-1361 Link Here
1357	ath_resume(struct net_device *dev)	1357	ath_resume(struct net_device *dev)
1358	{	1358	{
1359	struct ath_softc *sc = dev->priv;	1359	struct ath_softc *sc = netdev_priv(dev);
1360		1360
1361	DPRINTF(sc, ATH_DEBUG_ANY, "%s: flags %x\n", __func__, dev->flags);	1361	DPRINTF(sc, ATH_DEBUG_ANY, "%s: flags %x\n", __func__, dev->flags);
Lines 1650-1654 Link Here
1650	{	1650	{
1651	struct net_device *dev = dev_id;	1651	struct net_device *dev = dev_id;
1652	struct ath_softc *sc = dev->priv;	1652	struct ath_softc *sc = netdev_priv(dev);
1653	struct ath_hal *ah = sc->sc_ah;	1653	struct ath_hal *ah = sc->sc_ah;
1654	HAL_INT status;	1654	HAL_INT status;
Lines 1841-1845 Link Here
1841	{	1841	{
1842	struct net_device dev = (struct net_device )data;	1842	struct net_device dev = (struct net_device )data;
1843	struct ath_softc *sc = dev->priv;	1843	struct ath_softc *sc = netdev_priv(dev);
1844		1844
1845	if (time_before(jiffies, sc->sc_ic.ic_bmiss_guard)) {	1845	if (time_before(jiffies, sc->sc_ic.ic_bmiss_guard)) {
Lines 1884-1888 Link Here
1884	ath_init(struct net_device *dev)	1884	ath_init(struct net_device *dev)
1885	{	1885	{
1886	struct ath_softc *sc = dev->priv;	1886	struct ath_softc *sc = netdev_priv(dev);
1887	struct ieee80211com *ic = &sc->sc_ic;	1887	struct ieee80211com *ic = &sc->sc_ic;
1888	struct ath_hal *ah = sc->sc_ah;	1888	struct ath_hal *ah = sc->sc_ah;
Lines 2012-2016 Link Here
2012	ath_stop_locked(struct net_device *dev)	2012	ath_stop_locked(struct net_device *dev)
2013	{	2013	{
2014	struct ath_softc *sc = dev->priv;	2014	struct ath_softc *sc = netdev_priv(dev);
2015	struct ieee80211com *ic = &sc->sc_ic;	2015	struct ieee80211com *ic = &sc->sc_ic;
2016	struct ath_hal *ah = sc->sc_ah;	2016	struct ath_hal *ah = sc->sc_ah;
Lines 2076-2080 Link Here
2076	ath_stop(struct net_device *dev)	2076	ath_stop(struct net_device *dev)
2077	{	2077	{
2078	struct ath_softc *sc = dev->priv;	2078	struct ath_softc *sc = netdev_priv(dev);
2079	int error;	2079	int error;
2080		2080
Lines 2180-2184 Link Here
2180	ath_reset(struct net_device *dev)	2180	ath_reset(struct net_device *dev)
2181	{	2181	{
2182	struct ath_softc *sc = dev->priv;	2182	struct ath_softc *sc = netdev_priv(dev);
2183	struct ieee80211com *ic = &sc->sc_ic;	2183	struct ieee80211com *ic = &sc->sc_ic;
2184	struct ath_hal *ah = sc->sc_ah;	2184	struct ath_hal *ah = sc->sc_ah;
Lines 2341-2345 Link Here
2341	ath_tx_startraw(struct net_device dev, struct ath_buf bf, struct sk_buff *skb)	2341	ath_tx_startraw(struct net_device dev, struct ath_buf bf, struct sk_buff *skb)
2342	{	2342	{
2343	struct ath_softc *sc = dev->priv;	2343	struct ath_softc *sc = netdev_priv(dev);
2344	struct ath_hal *ah = sc->sc_ah;	2344	struct ath_hal *ah = sc->sc_ah;
2345	struct ieee80211_phy_params ph = (struct ieee80211_phy_params ) (skb->cb + sizeof(struct ieee80211_cb));	2345	struct ieee80211_phy_params ph = (struct ieee80211_phy_params ) (skb->cb + sizeof(struct ieee80211_cb));
Lines 2556-2560 Link Here
2556	ath_hardstart(struct sk_buff skb, struct net_device dev)	2556	ath_hardstart(struct sk_buff skb, struct net_device dev)
2557	{	2557	{
2558	struct ath_softc *sc = dev->priv;	2558	struct ath_softc *sc = netdev_priv(dev);
2559	struct ieee80211_node *ni = NULL;	2559	struct ieee80211_node *ni = NULL;
2560	struct ath_buf *bf = NULL;	2560	struct ath_buf *bf = NULL;
Lines 2873-2877 Link Here
2873	{	2873	{
2874	struct net_device *dev = ic->ic_dev;	2874	struct net_device *dev = ic->ic_dev;
2875	struct ath_softc *sc = dev->priv;	2875	struct ath_softc *sc = netdev_priv(dev);
2876	struct ieee80211_node *ni = NULL;	2876	struct ieee80211_node *ni = NULL;
2877	struct ath_buf *bf = NULL;	2877	struct ath_buf *bf = NULL;
Lines 3235-3239 Link Here
3235	{	3235	{
3236	struct net_device *dev = vap->iv_ic->ic_dev;	3236	struct net_device *dev = vap->iv_ic->ic_dev;
3237	struct ath_softc *sc = dev->priv;	3237	struct ath_softc *sc = netdev_priv(dev);
3238		3238
3239	/*	3239	/*
Lines 3302-3306 Link Here
3302	{	3302	{
3303	struct net_device *dev = vap->iv_ic->ic_dev;	3303	struct net_device *dev = vap->iv_ic->ic_dev;
3304	struct ath_softc *sc = dev->priv;	3304	struct ath_softc *sc = netdev_priv(dev);
3305	struct ath_hal *ah = sc->sc_ah;	3305	struct ath_hal *ah = sc->sc_ah;
3306	const struct ieee80211_cipher *cip = k->wk_cipher;	3306	const struct ieee80211_cipher *cip = k->wk_cipher;
Lines 3378-3382 Link Here
3378	{	3378	{
3379	struct net_device *dev = vap->iv_ic->ic_dev;	3379	struct net_device *dev = vap->iv_ic->ic_dev;
3380	struct ath_softc *sc = dev->priv;	3380	struct ath_softc *sc = netdev_priv(dev);
3381		3381
3382	return ath_keyset(sc, k, mac, vap->iv_bss);	3382	return ath_keyset(sc, k, mac, vap->iv_bss);
Lines 3393-3397 Link Here
3393	{	3393	{
3394	struct net_device *dev = vap->iv_ic->ic_dev;	3394	struct net_device *dev = vap->iv_ic->ic_dev;
3395	struct ath_softc *sc = dev->priv;	3395	struct ath_softc *sc = netdev_priv(dev);
3396		3396
3397	DPRINTF(sc, ATH_DEBUG_KEYCACHE, "%s:\n", __func__);	3397	DPRINTF(sc, ATH_DEBUG_KEYCACHE, "%s:\n", __func__);
Lines 3414-3418 Link Here
3414	{	3414	{
3415	struct net_device *dev = vap->iv_ic->ic_dev;	3415	struct net_device *dev = vap->iv_ic->ic_dev;
3416	struct ath_softc *sc = dev->priv;	3416	struct ath_softc *sc = netdev_priv(dev);
3417		3417
3418	DPRINTF(sc, ATH_DEBUG_KEYCACHE, "%s:\n", __func__);	3418	DPRINTF(sc, ATH_DEBUG_KEYCACHE, "%s:\n", __func__);
Lines 3502-3506 Link Here
3502	ath_mode_init(struct net_device *dev)	3502	ath_mode_init(struct net_device *dev)
3503	{	3503	{
3504	struct ath_softc *sc = dev->priv;	3504	struct ath_softc *sc = netdev_priv(dev);
3505	struct ath_hal *ah = sc->sc_ah;	3505	struct ath_hal *ah = sc->sc_ah;
3506	u_int32_t rfilt, mfilt[2];	3506	u_int32_t rfilt, mfilt[2];
Lines 3553-3557 Link Here
3553	ath_updateslot(struct net_device *dev)	3553	ath_updateslot(struct net_device *dev)
3554	{	3554	{
3555	struct ath_softc *sc = dev->priv;	3555	struct ath_softc *sc = netdev_priv(dev);
3556	struct ieee80211com *ic = &sc->sc_ic;	3556	struct ieee80211com *ic = &sc->sc_ic;
3557		3557
Lines 3583-3587 Link Here
3583	(IEEE80211_ATHC_TURBOP))	3583	(IEEE80211_ATHC_TURBOP))
3584	struct ieee80211com *ic = vap->iv_ic;	3584	struct ieee80211com *ic = vap->iv_ic;
3585	struct ath_softc *sc = ic->ic_dev->priv;	3585	struct ath_softc *sc = netdev_priv(ic->ic_dev);
3586		3586
3587	if (ic->ic_opmode == IEEE80211_M_HOSTAP && IS_CAPABLE(vap)) {	3587	if (ic->ic_opmode == IEEE80211_M_HOSTAP && IS_CAPABLE(vap)) {
Lines 3631-3635 Link Here
3631	{	3631	{
3632	struct ieee80211com *ic = vap->iv_ic;	3632	struct ieee80211com *ic = vap->iv_ic;
3633	struct ath_softc *sc = ic->ic_dev->priv;	3633	struct ath_softc *sc = netdev_priv(ic->ic_dev);
3634	u_int32_t bss_traffic;	3634	u_int32_t bss_traffic;
3635		3635
Lines 3774-3778 Link Here
3774	{	3774	{
3775	struct net_device dev = (struct net_device )data;	3775	struct net_device dev = (struct net_device )data;
3776	struct ath_softc *sc = dev->priv;	3776	struct ath_softc *sc = netdev_priv(dev);
3777	struct ieee80211com *ic = &sc->sc_ic;	3777	struct ieee80211com *ic = &sc->sc_ic;
3778	int newflags;	3778	int newflags;
Lines 4366-4370 Link Here
4366	{	4366	{
4367	struct net_device dev = (struct net_device )data;	4367	struct net_device dev = (struct net_device )data;
4368	struct ath_softc *sc = dev->priv;	4368	struct ath_softc *sc = netdev_priv(dev);
4369	/*	4369	/*
4370	* XXX:if the bmisscount is cleared while the	4370	* XXX:if the bmisscount is cleared while the
Lines 4818-4822 Link Here
4818	ath_node_alloc(struct ieee80211_node_table nt,struct ieee80211vap vap)	4818	ath_node_alloc(struct ieee80211_node_table nt,struct ieee80211vap vap)
4819	{	4819	{
4820	struct ath_softc *sc = nt->nt_ic->ic_dev->priv;	4820	struct ath_softc *sc = netdev_priv(nt->nt_ic->ic_dev);
4821	const size_t space = sizeof(struct ath_node) + sc->sc_rc->arc_space;	4821	const size_t space = sizeof(struct ath_node) + sc->sc_rc->arc_space;
4822	struct ath_node *an;	4822	struct ath_node *an;
Lines 4853-4857 Link Here
4853	{	4853	{
4854	struct ieee80211com *ic = ni->ni_ic;	4854	struct ieee80211com *ic = ni->ni_ic;
4855	struct ath_softc *sc = ni->ni_ic->ic_dev->priv;	4855	struct ath_softc *sc = netdev_priv(ni->ni_ic->ic_dev);
4856	struct ath_node *an = ATH_NODE(ni);	4856	struct ath_node *an = ATH_NODE(ni);
4857	struct ath_buf *bf;	4857	struct ath_buf *bf;
Lines 4907-4911 Link Here
4907	ath_node_free(struct ieee80211_node *ni)	4907	ath_node_free(struct ieee80211_node *ni)
4908	{	4908	{
4909	struct ath_softc *sc = ni->ni_ic->ic_dev->priv;	4909	struct ath_softc *sc = netdev_priv(ni->ni_ic->ic_dev);
4910		4910
4911	sc->sc_rc->ops->node_cleanup(sc, ATH_NODE(ni));	4911	sc->sc_rc->ops->node_cleanup(sc, ATH_NODE(ni));
Lines 4950-4954 Link Here
4950	struct ath_txq *txq = NULL;	4950	struct ath_txq *txq = NULL;
4951	struct ieee80211com *ic = ni->ni_ic;	4951	struct ieee80211com *ic = ni->ni_ic;
4952	struct ath_softc *sc = ic->ic_dev->priv;	4952	struct ath_softc *sc = netdev_priv(ic->ic_dev);
4953	struct ath_buf bf, prev, bf_tmp, bf_tmp1;	4953	struct ath_buf bf, prev, bf_tmp, bf_tmp1;
4954	struct ath_hal *ah = sc->sc_ah;	4954	struct ath_hal *ah = sc->sc_ah;
Lines 5402-5406 Link Here
5402	ath_rx_capture(struct net_device dev, struct ath_desc ds, struct sk_buff *skb)	5402	ath_rx_capture(struct net_device dev, struct ath_desc ds, struct sk_buff *skb)
5403	{	5403	{
5404	struct ath_softc *sc = dev->priv;	5404	struct ath_softc *sc = netdev_priv(dev);
5405	struct ieee80211com *ic = &sc->sc_ic;	5405	struct ieee80211com *ic = &sc->sc_ic;
5406	struct ieee80211_frame wh = (struct ieee80211_frame ) skb->data;	5406	struct ieee80211_frame wh = (struct ieee80211_frame ) skb->data;
Lines 5435-5439 Link Here
5435	ath_tx_capture(struct net_device dev, struct ath_desc ds, struct sk_buff *skb)	5435	ath_tx_capture(struct net_device dev, struct ath_desc ds, struct sk_buff *skb)
5436	{	5436	{
5437	struct ath_softc *sc = dev->priv;	5437	struct ath_softc *sc = netdev_priv(dev);
5438	struct ieee80211com *ic = &sc->sc_ic;	5438	struct ieee80211com *ic = &sc->sc_ic;
5439	struct ieee80211_frame *wh;	5439	struct ieee80211_frame *wh;
Lines 5500-5504 Link Here
5500	int subtype, int rssi, u_int32_t rstamp)	5500	int subtype, int rssi, u_int32_t rstamp)
5501	{	5501	{
5502	struct ath_softc *sc = ni->ni_ic->ic_dev->priv;	5502	struct ath_softc *sc = netdev_priv(ni->ni_ic->ic_dev);
5503	struct ieee80211vap *vap = ni->ni_vap;	5503	struct ieee80211vap *vap = ni->ni_vap;
5504		5504
Lines 5572-5576 Link Here
5572	struct net_device dev = (struct net_device )data;	5572	struct net_device dev = (struct net_device )data;
5573	struct ath_buf *bf;	5573	struct ath_buf *bf;
5574	struct ath_softc *sc = dev->priv;	5574	struct ath_softc *sc = netdev_priv(dev);
5575	struct ieee80211com *ic = &sc->sc_ic;	5575	struct ieee80211com *ic = &sc->sc_ic;
5576	struct ath_hal *ah = sc->sc_ah;	5576	struct ath_hal *ah = sc->sc_ah;
Lines 6011-6015 Link Here
6011	struct ath_buf bf, head = NULL;	6011	struct ath_buf bf, head = NULL;
6012	struct ieee80211com *ic = vap->iv_ic;	6012	struct ieee80211com *ic = vap->iv_ic;
6013	struct ath_softc *sc = ic->ic_dev->priv;	6013	struct ath_softc *sc = netdev_priv(ic->ic_dev);
6014	struct ath_hal *ah = sc->sc_ah;	6014	struct ath_hal *ah = sc->sc_ah;
6015	u_int8_t rate;	6015	u_int8_t rate;
Lines 6224-6228 Link Here
6224	{	6224	{
6225	struct ieee80211com *ic = vap->iv_ic;	6225	struct ieee80211com *ic = vap->iv_ic;
6226	struct ath_softc *sc = ic->ic_dev->priv;	6226	struct ath_softc *sc = netdev_priv(ic->ic_dev);
6227	struct ath_hal *ah = sc->sc_ah;	6227	struct ath_hal *ah = sc->sc_ah;
6228	struct ath_txq *txq = &sc->sc_grpplq;	6228	struct ath_txq *txq = &sc->sc_grpplq;
Lines 6439-6443 Link Here
6439	ath_wme_update(struct ieee80211com *ic)	6439	ath_wme_update(struct ieee80211com *ic)
6440	{	6440	{
6441	struct ath_softc *sc = ic->ic_dev->priv;	6441	struct ath_softc *sc = netdev_priv(ic->ic_dev);
6442		6442
6443	if (sc->sc_uapsdq)	6443	if (sc->sc_uapsdq)
Lines 6458-6462 Link Here
6458	struct ath_node *an = ATH_NODE(ni);	6458	struct ath_node *an = ATH_NODE(ni);
6459	struct ath_buf *bf;	6459	struct ath_buf *bf;
6460	struct ath_softc *sc = ni->ni_ic->ic_dev->priv;	6460	struct ath_softc *sc = netdev_priv(ni->ni_ic->ic_dev);
6461	struct ath_txq *txq;	6461	struct ath_txq *txq;
6462		6462
Lines 6653-6657 Link Here
6653	{	6653	{
6654	#define MIN(a,b) ((a) < (b) ? (a) : (b))	6654	#define MIN(a,b) ((a) < (b) ? (a) : (b))
6655	struct ath_softc *sc = dev->priv;	6655	struct ath_softc *sc = netdev_priv(dev);
6656	struct ieee80211com *ic = ni->ni_ic;	6656	struct ieee80211com *ic = ni->ni_ic;
6657	struct ieee80211vap *vap = ni->ni_vap;	6657	struct ieee80211vap *vap = ni->ni_vap;
Lines 7493-7497 Link Here
7493	{	7493	{
7494	struct net_device dev = (struct net_device )data;	7494	struct net_device dev = (struct net_device )data;
7495	struct ath_softc *sc = dev->priv;	7495	struct ath_softc *sc = netdev_priv(dev);
7496		7496
7497	if (txqactive(sc->sc_ah, 0))	7497	if (txqactive(sc->sc_ah, 0))
Lines 7514-7518 Link Here
7514	{	7514	{
7515	struct net_device dev = (struct net_device )data;	7515	struct net_device dev = (struct net_device )data;
7516	struct ath_softc *sc = dev->priv;	7516	struct ath_softc *sc = netdev_priv(dev);
7517		7517
7518	/*	7518	/*
Lines 7549-7553 Link Here
7549	{	7549	{
7550	struct net_device dev = (struct net_device )data;	7550	struct net_device dev = (struct net_device )data;
7551	struct ath_softc *sc = dev->priv;	7551	struct ath_softc *sc = netdev_priv(dev);
7552	int i;	7552	int i;
7553		7553
Lines 7572-7576 Link Here
7572	ath_tx_timeout(struct net_device *dev)	7572	ath_tx_timeout(struct net_device *dev)
7573	{	7573	{
7574	struct ath_softc *sc = dev->priv;	7574	struct ath_softc *sc = netdev_priv(dev);
7575		7575
7576	DPRINTF(sc, ATH_DEBUG_WATCHDOG, "%s: %sRUNNING %svalid\n",	7576	DPRINTF(sc, ATH_DEBUG_WATCHDOG, "%s: %sRUNNING %svalid\n",
Lines 7935-7939 Link Here
7935	{	7935	{
7936	struct net_device dev = (struct net_device ) arg;	7936	struct net_device dev = (struct net_device ) arg;
7937	struct ath_softc *sc = dev->priv;	7937	struct ath_softc *sc = netdev_priv(dev);
7938	struct ath_hal *ah = sc->sc_ah;	7938	struct ath_hal *ah = sc->sc_ah;
7939	struct ieee80211com *ic = &sc->sc_ic;	7939	struct ieee80211com *ic = &sc->sc_ic;
Lines 8001-8005 Link Here
8001	{	8001	{
8002	struct net_device *dev = ic->ic_dev;	8002	struct net_device *dev = ic->ic_dev;
8003	struct ath_softc *sc = dev->priv;	8003	struct ath_softc *sc = netdev_priv(dev);
8004	struct ath_hal *ah = sc->sc_ah;	8004	struct ath_hal *ah = sc->sc_ah;
8005	u_int32_t rfilt;	8005	u_int32_t rfilt;
Lines 8021-8025 Link Here
8021	{	8021	{
8022	struct net_device *dev = ic->ic_dev;	8022	struct net_device *dev = ic->ic_dev;
8023	struct ath_softc *sc = dev->priv;	8023	struct ath_softc *sc = netdev_priv(dev);
8024	struct ath_hal *ah = sc->sc_ah;	8024	struct ath_hal *ah = sc->sc_ah;
8025	u_int32_t rfilt;	8025	u_int32_t rfilt;
Lines 8039-8043 Link Here
8039	{	8039	{
8040	struct net_device *dev = ic->ic_dev;	8040	struct net_device *dev = ic->ic_dev;
8041	struct ath_softc *sc = dev->priv;	8041	struct ath_softc *sc = netdev_priv(dev);
8042		8042
8043	(void) ath_chan_set(sc, ic->ic_curchan);	8043	(void) ath_chan_set(sc, ic->ic_curchan);
Lines 8055-8059 Link Here
8055	ath_set_coverageclass(struct ieee80211com *ic)	8055	ath_set_coverageclass(struct ieee80211com *ic)
8056	{	8056	{
8057	struct ath_softc *sc = ic->ic_dev->priv;	8057	struct ath_softc *sc = netdev_priv(ic->ic_dev);
8058		8058
8059	ath_hal_setcoverageclass(sc->sc_ah, ic->ic_coverageclass, 0);	8059	ath_hal_setcoverageclass(sc->sc_ah, ic->ic_coverageclass, 0);
Lines 8065-8069 Link Here
8065	ath_mhz2ieee(struct ieee80211com *ic, u_int freq, u_int flags)	8065	ath_mhz2ieee(struct ieee80211com *ic, u_int freq, u_int flags)
8066	{	8066	{
8067	struct ath_softc *sc = ic->ic_dev->priv;	8067	struct ath_softc *sc = netdev_priv(ic->ic_dev);
8068		8068
8069	return (ath_hal_mhz2ieee(sc->sc_ah, freq, flags));	8069	return (ath_hal_mhz2ieee(sc->sc_ah, freq, flags));
Lines 8080-8084 Link Here
8080	struct ieee80211com *ic = vap->iv_ic;	8080	struct ieee80211com *ic = vap->iv_ic;
8081	struct net_device *dev = ic->ic_dev;	8081	struct net_device *dev = ic->ic_dev;
8082	struct ath_softc *sc = dev->priv;	8082	struct ath_softc *sc = netdev_priv(dev);
8083	struct ath_hal *ah = sc->sc_ah;	8083	struct ath_hal *ah = sc->sc_ah;
8084	struct ieee80211_node ni, wds_ni;	8084	struct ieee80211_node ni, wds_ni;
Lines 8415-8419 Link Here
8415	#define IEEE80211_KEY_XR (IEEE80211_KEY_XMIT \| IEEE80211_KEY_RECV)	8415	#define IEEE80211_KEY_XR (IEEE80211_KEY_XMIT \| IEEE80211_KEY_RECV)
8416	struct ieee80211vap *vap = ni->ni_vap;	8416	struct ieee80211vap *vap = ni->ni_vap;
8417	struct ath_softc *sc = vap->iv_ic->ic_dev->priv;	8417	struct ath_softc *sc = netdev_priv(vap->iv_ic->ic_dev);
8418	struct ath_node *an = ATH_NODE(ni);	8418	struct ath_node *an = ATH_NODE(ni);
8419	u_int16_t keyindex;	8419	u_int16_t keyindex;
Lines 8469-8473 Link Here
8469	{	8469	{
8470	struct ieee80211vap *vap = ni->ni_vap;	8470	struct ieee80211vap *vap = ni->ni_vap;
8471	struct ath_softc *sc = vap->iv_ic->ic_dev->priv;	8471	struct ath_softc *sc = netdev_priv(vap->iv_ic->ic_dev);
8472	u_int16_t keyix;	8472	u_int16_t keyix;
8473		8473
Lines 8629-8633 Link Here
8629	struct ieee80211com *ic = ni->ni_ic;	8629	struct ieee80211com *ic = ni->ni_ic;
8630	struct ieee80211vap *vap = ni->ni_vap;	8630	struct ieee80211vap *vap = ni->ni_vap;
8631	struct ath_softc *sc = ic->ic_dev->priv;	8631	struct ath_softc *sc = netdev_priv(ic->ic_dev);
8632		8632
8633	sc->sc_rc->ops->newassoc(sc, ATH_NODE(ni), isnew);	8633	sc->sc_rc->ops->newassoc(sc, ATH_NODE(ni), isnew);
Lines 8660-8664 Link Here
8660	HAL_BOOL outdoor, HAL_BOOL xchanmode)	8660	HAL_BOOL outdoor, HAL_BOOL xchanmode)
8661	{	8661	{
8662	struct ath_softc *sc = dev->priv;	8662	struct ath_softc *sc = netdev_priv(dev);
8663	struct ieee80211com *ic = &sc->sc_ic;	8663	struct ieee80211com *ic = &sc->sc_ic;
8664	struct ath_hal *ah = sc->sc_ah;	8664	struct ath_hal *ah = sc->sc_ah;
Lines 8830-8834 Link Here
8830	ath_xr_rate_setup(struct net_device *dev)	8830	ath_xr_rate_setup(struct net_device *dev)
8831	{	8831	{
8832	struct ath_softc *sc = dev->priv;	8832	struct ath_softc *sc = netdev_priv(dev);
8833	struct ath_hal *ah = sc->sc_ah;	8833	struct ath_hal *ah = sc->sc_ah;
8834	struct ieee80211com *ic = &sc->sc_ic;	8834	struct ieee80211com *ic = &sc->sc_ic;
Lines 8859-8863 Link Here
8859	ath_setup_subrates(struct net_device *dev)	8859	ath_setup_subrates(struct net_device *dev)
8860	{	8860	{
8861	struct ath_softc *sc = dev->priv;	8861	struct ath_softc *sc = netdev_priv(dev);
8862	struct ath_hal *ah = sc->sc_ah;	8862	struct ath_hal *ah = sc->sc_ah;
8863	struct ieee80211com *ic = &sc->sc_ic;	8863	struct ieee80211com *ic = &sc->sc_ic;
Lines 8902-8906 Link Here
8902	ath_rate_setup(struct net_device *dev, u_int mode)	8902	ath_rate_setup(struct net_device *dev, u_int mode)
8903	{	8903	{
8904	struct ath_softc *sc = dev->priv;	8904	struct ath_softc *sc = netdev_priv(dev);
8905	struct ath_hal *ah = sc->sc_ah;	8905	struct ath_hal *ah = sc->sc_ah;
8906	struct ieee80211com *ic = &sc->sc_ic;	8906	struct ieee80211com *ic = &sc->sc_ic;
Lines 9139-9143 Link Here
9139	ath_getstats(struct net_device *dev)	9139	ath_getstats(struct net_device *dev)
9140	{	9140	{
9141	struct ath_softc *sc = dev->priv;	9141	struct ath_softc *sc = netdev_priv(dev);
9142	struct net_device_stats *stats = &sc->sc_devstats;	9142	struct net_device_stats *stats = &sc->sc_devstats;
9143		9143
Lines 9162-9166 Link Here
9162	ath_set_mac_address(struct net_device dev, void addr)	9162	ath_set_mac_address(struct net_device dev, void addr)
9163	{	9163	{
9164	struct ath_softc *sc = dev->priv;	9164	struct ath_softc *sc = netdev_priv(dev);
9165	struct ieee80211com *ic = &sc->sc_ic;	9165	struct ieee80211com *ic = &sc->sc_ic;
9166	struct ath_hal *ah = sc->sc_ah;	9166	struct ath_hal *ah = sc->sc_ah;
Lines 9194-9198 Link Here
9194	ath_change_mtu(struct net_device *dev, int mtu)	9194	ath_change_mtu(struct net_device *dev, int mtu)
9195	{	9195	{
9196	struct ath_softc *sc = dev->priv;	9196	struct ath_softc *sc = netdev_priv(dev);
9197	int error = 0;	9197	int error = 0;
9198		9198
Lines 9281-9285 Link Here
9281	ath_ioctl(struct net_device dev, struct ifreq ifr, int cmd)	9281	ath_ioctl(struct net_device dev, struct ifreq ifr, int cmd)
9282	{	9282	{
9283	struct ath_softc *sc = dev->priv;	9283	struct ath_softc *sc = netdev_priv(dev);
9284	struct ieee80211com *ic = &sc->sc_ic;	9284	struct ieee80211com *ic = &sc->sc_ic;
9285	int error;	9285	int error;
Lines 9777-9781 Link Here
9777	{	9777	{
9778	#define HAL_MODE_DUALBAND (HAL_MODE_11A\|HAL_MODE_11B)	9778	#define HAL_MODE_DUALBAND (HAL_MODE_11A\|HAL_MODE_11B)
9779	struct ath_softc *sc = dev->priv;	9779	struct ath_softc *sc = netdev_priv(dev);
9780	struct ath_hal *ah = sc->sc_ah;	9780	struct ath_hal *ah = sc->sc_ah;
9781	u_int modes, cc;	9781	u_int modes, cc;
Lines 9924-9928 Link Here
9924	{	9924	{
9925	struct net_device dev = (struct net_device ) ptr;	9925	struct net_device dev = (struct net_device ) ptr;
9926	struct ath_softc sc = (struct ath_softc ) dev->priv;	9926	struct ath_softc sc = (struct ath_softc ) netdev_priv(dev);
9927		9927
9928	if (!dev \|\| !sc \|\| dev->open != &ath_init)	9928	if (!dev \|\| !sc \|\| dev->open != &ath_init)

Return to bug 262761