Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 186314 Details for
Bug 262761
net-wireless/madwifi-ng fails to build on kernel >= 2.6.29
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
upstream patch for 2.6.29
madwifi-ng-0.9.4-2.6.29-r3907.patch (text/plain), 40.41 KB, created by
Tobias Kral
on 2009-03-26 10:25:46 UTC
(
hide
)
Description:
upstream patch for 2.6.29
Filename:
MIME Type:
Creator:
Tobias Kral
Created:
2009-03-26 10:25:46 UTC
Size:
40.41 KB
patch
obsolete
>Index: /madwifi/branches/madwifi-0.9.4/net80211/ieee80211.c >=================================================================== >--- /madwifi/branches/madwifi-0.9.4/net80211/ieee80211.c (revision 3080) >+++ /madwifi/branches/madwifi-0.9.4/net80211/ieee80211.c (revision 3907) >@@ -379,5 +379,5 @@ > (IEEE80211_C_IBSS | IEEE80211_C_HOSTAP | IEEE80211_C_AHDEMO | \ > IEEE80211_C_MONITOR) >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct net_device *parent = ic->ic_dev; > int err; >@@ -1019,5 +1019,5 @@ > ieee80211com_media_status(struct net_device *dev, struct ifmediareq *imr) > { >- struct ieee80211com *ic = dev->priv; /*XXX*/ >+ struct ieee80211com *ic = netdev_priv(dev); /*XXX*/ > > imr->ifm_status = IFM_AVALID; >@@ -1071,5 +1071,5 @@ > ieee80211com_media_change(struct net_device *dev) > { >- struct ieee80211com *ic = dev->priv; /*XXX*/ >+ struct ieee80211com *ic = netdev_priv(dev); /*XXX*/ > struct ieee80211vap *vap; > struct ifmedia_entry *ime = ic->ic_media.ifm_cur; >@@ -1184,5 +1184,5 @@ > ieee80211_media_change(struct net_device *dev) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > struct ifmedia_entry *ime = vap->iv_media.ifm_cur; >@@ -1228,5 +1228,5 @@ > ieee80211_media_status(struct net_device *dev, struct ifmediareq *imr) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > enum ieee80211_phymode mode; >@@ -1446,5 +1446,5 @@ > ieee80211_getstats(struct net_device *dev) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct net_device_stats *stats = &vap->iv_devstats; > >@@ -1485,5 +1485,5 @@ > ieee80211_set_multicast_list(struct net_device *dev) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > struct net_device *parent = ic->ic_dev; >Index: /madwifi/branches/madwifi-0.9.4/net80211/ieee80211_wireless.c >=================================================================== >--- /madwifi/branches/madwifi-0.9.4/net80211/ieee80211_wireless.c (revision 3863) >+++ /madwifi/branches/madwifi-0.9.4/net80211/ieee80211_wireless.c (revision 3907) >@@ -79,5 +79,5 @@ > preempt_scan(struct net_device *dev, int max_grace, int max_wait) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > int total_delay = 0; >@@ -112,5 +112,5 @@ > ieee80211_iw_getstats(struct net_device *dev) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct iw_statistics *is = &vap->iv_iwstats; > struct ieee80211com *ic = vap->iv_ic; >@@ -136,5 +136,5 @@ > char *name, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211_channel *c = vap->iv_ic->ic_curchan; > >@@ -186,5 +186,5 @@ > struct iw_request_info *info, struct iw_point *erq, char *keybuf) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > int kid, error; > int wepchange = 0; >@@ -290,5 +290,5 @@ > struct iw_point *erq, char *key) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211_key *k; > int error, kid; >@@ -334,5 +334,5 @@ > IFM_IEEE80211_11G | IFM_IEEE80211_TURBO, > }; >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > struct ifreq ifr; >@@ -369,5 +369,5 @@ > struct iw_param *rrq, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ifmediareq imr; > int rate; >@@ -407,5 +407,5 @@ > struct iw_param *rts, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > u16 val; >@@ -430,5 +430,5 @@ > struct iw_param *rts, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > > rts->value = vap->iv_rtsthreshold; >@@ -443,5 +443,5 @@ > struct iw_param *rts, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > u16 val; >@@ -466,5 +466,5 @@ > struct iw_param *rts, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > > rts->value = vap->iv_fragthreshold; >@@ -479,5 +479,5 @@ > struct sockaddr *ap_addr, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > > /* NB: should not be set when in AP mode */ >@@ -514,5 +514,5 @@ > struct sockaddr *ap_addr, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > > if (vap->iv_flags & IEEE80211_F_DESBSSID) >@@ -535,5 +535,5 @@ > struct iw_point *data, char *nickname) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > > if (data->length > IEEE80211_NWID_LEN) >@@ -551,5 +551,5 @@ > struct iw_point *data, char *nickname) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > > if (data->length > vap->iv_nicknamelen + 1) >@@ -660,5 +660,5 @@ > struct iw_freq *freq, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > struct ieee80211_channel *c, *c2; >@@ -774,5 +774,5 @@ > struct iw_freq *freq, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > >@@ -815,5 +815,5 @@ > struct iw_point *data, char *ssid) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > > if (vap->iv_opmode == IEEE80211_M_WDS) >@@ -857,5 +857,5 @@ > struct iw_point *data, char *essid) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > > if (vap->iv_opmode == IEEE80211_M_WDS) >@@ -888,5 +888,5 @@ > struct iw_point *data, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > struct ieee80211_node *ni = vap->iv_bss; >@@ -1035,5 +1035,5 @@ > { > /* save the list of node addresses */ >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct sockaddr address[IW_MAX_SPY]; > unsigned int number = data->length; >@@ -1073,5 +1073,5 @@ > * copy out rssi, set updated flag appropriately > */ >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211_node_table *nt = &vap->iv_ic->ic_sta; > struct ieee80211_node *ni; >@@ -1119,5 +1119,5 @@ > struct iw_point *data, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct iw_thrspy threshold; > >@@ -1156,5 +1156,5 @@ > struct iw_point *data, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > struct iw_thrspy *threshold; >@@ -1177,5 +1177,5 @@ > __u32 *mode, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ifmediareq imr; > int valid = 0; >@@ -1204,5 +1204,5 @@ > __u32 *mode, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ifmediareq imr; > >@@ -1229,5 +1229,5 @@ > struct iw_param *wrq, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > >@@ -1269,5 +1269,5 @@ > struct iw_param *rrq, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > >@@ -1293,5 +1293,5 @@ > struct iw_param *rrq, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > >@@ -1325,5 +1325,5 @@ > struct iw_param *rrq, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > > rrq->disabled = (vap->iv_flags & IEEE80211_F_SWRETRY) == 0; >@@ -1356,5 +1356,5 @@ > struct iw_param *rrq, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > int fixed, disabled; >@@ -1411,5 +1411,5 @@ > struct iw_param *rrq, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > >@@ -1451,5 +1451,5 @@ > struct iw_point *data, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > struct waplistreq req; /* XXX off stack */ >@@ -1473,5 +1473,5 @@ > struct iw_point *data, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > > /* >@@ -1821,5 +1821,5 @@ > struct iw_point *data, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > struct iwscanreq req; >@@ -1923,5 +1923,5 @@ > struct iw_point *wri, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > struct ifreq ifr; >@@ -2048,8 +2048,8 @@ > ieee80211_set_turbo(struct net_device *dev, int flag) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > struct ifreq ifr; >- struct ieee80211vap *tmpvap = dev->priv; >+ struct ieee80211vap *tmpvap = netdev_priv(dev); > int nvap = 0; > >@@ -2072,5 +2072,5 @@ > void *w, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > struct ieee80211_rsnparms *rsn = &vap->iv_bss->ni_rsn; >@@ -2604,5 +2604,5 @@ > struct iw_point *wri, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > struct ifmediareq imr; >@@ -2642,5 +2642,5 @@ > void *w, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > struct ieee80211_rsnparms *rsn = &vap->iv_bss->ni_rsn; >@@ -2917,5 +2917,5 @@ > struct iw_point *wri, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > void *ie; > >@@ -2951,5 +2951,5 @@ > struct iw_point *wri, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > > if (vap->iv_opt_ie == NULL) { >@@ -3015,5 +3015,5 @@ > struct iw_point *data, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211req_getset_appiebuf *iebuf = > (struct ieee80211req_getset_appiebuf *)extra; >@@ -3057,5 +3057,5 @@ > struct iw_point *data, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211req_getset_appiebuf *iebuf = > (struct ieee80211req_getset_appiebuf *)extra; >@@ -3098,5 +3098,5 @@ > void *w, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211req_set_filter *app_filter = (struct ieee80211req_set_filter *)extra; > >@@ -3113,5 +3113,5 @@ > void *w, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > struct ieee80211req_key *ik = (struct ieee80211req_key *)extra; >@@ -3182,5 +3182,5 @@ > ieee80211_ioctl_getkey(struct net_device *dev, struct iwreq *iwr) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > struct ieee80211_node *ni; >@@ -3238,5 +3238,5 @@ > void *w, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > struct ieee80211req_del_key *dk = (struct ieee80211req_del_key *)extra; >@@ -3310,5 +3310,5 @@ > void *w, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > struct ieee80211req_mlme *mlme = (struct ieee80211req_mlme *)extra; >@@ -3406,5 +3406,5 @@ > void *w, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct sockaddr *sa = (struct sockaddr *)extra; > struct ieee80211com *ic = vap->iv_ic; >@@ -3433,5 +3433,5 @@ > void *w, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct sockaddr *sa = (struct sockaddr *)extra; > struct ieee80211com *ic = vap->iv_ic; >@@ -3483,5 +3483,5 @@ > void *w, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct sockaddr *sa = (struct sockaddr *)extra; > const struct ieee80211_aclator *acl = vap->iv_acl; >@@ -3501,5 +3501,5 @@ > void *w, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct sockaddr *sa = (struct sockaddr *)extra; > const struct ieee80211_aclator *acl = vap->iv_acl; >@@ -3519,5 +3519,5 @@ > struct iw_request_info *info, void *w, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > struct ieee80211req_chanlist *list = >@@ -3561,5 +3561,5 @@ > struct iw_request_info *info, void *w, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > >@@ -3572,5 +3572,5 @@ > struct iw_request_info *info, void *w, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > struct ieee80211req_chaninfo *chans = >@@ -3616,5 +3616,5 @@ > struct iw_request_info *info, void *w, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > int *param = (int *) extra; > int ac = (param[1] >= 0 && param[1] < WME_NUM_AC) ? >@@ -3705,5 +3705,5 @@ > struct iw_request_info *info, void *w, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > int *param = (int *) extra; > int ac = (param[1] >= 0 && param[1] < WME_NUM_AC) ? >@@ -3741,5 +3741,5 @@ > ieee80211_ioctl_getwpaie(struct net_device *dev, struct iwreq *iwr) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > struct ieee80211_node *ni; >@@ -3774,5 +3774,5 @@ > ieee80211_ioctl_getstastats(struct net_device *dev, struct iwreq *iwr) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > struct ieee80211_node *ni; >@@ -3892,5 +3892,5 @@ > ieee80211_ioctl_getscanresults(struct net_device *dev, struct iwreq *iwr) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > struct scanreq req; >@@ -4050,5 +4050,5 @@ > ieee80211_ioctl_getstainfo(struct net_device *dev, struct iwreq *iwr) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > struct stainforeq req; >@@ -4084,5 +4084,5 @@ > static void > pre_announced_chanswitch(struct net_device *dev, u_int32_t channel, u_int32_t tbtt) { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > /* now flag the beacon update to include the channel switch IE */ >@@ -4096,5 +4096,5 @@ > void *w, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > int *param = (int *) extra; >@@ -4141,5 +4141,5 @@ > struct iw_request_info *info, struct iw_point *out, char *buf) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > > if (out->length < vap->iv_opt_ie_len) >@@ -4674,5 +4674,5 @@ > struct iw_request_info *info, struct iw_point *erq, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct iw_encode_ext *ext; > struct ieee80211_key *wk; >@@ -4734,5 +4734,5 @@ > struct iw_request_info *info, struct iw_point *erq, char *extra) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct iw_encode_ext *ext = (struct iw_encode_ext *)extra; > struct ieee80211req_key kr; >@@ -5318,5 +5318,5 @@ > ieee80211_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > u_int unit; > >Index: /madwifi/branches/madwifi-0.9.4/net80211/ieee80211_output.c >=================================================================== >--- /madwifi/branches/madwifi-0.9.4/net80211/ieee80211_output.c (revision 3058) >+++ /madwifi/branches/madwifi-0.9.4/net80211/ieee80211_output.c (revision 3907) >@@ -201,5 +201,5 @@ > ieee80211_hardstart(struct sk_buff *skb, struct net_device *dev) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > struct net_device *parent = ic->ic_dev; >@@ -305,5 +305,5 @@ > > void ieee80211_parent_queue_xmit(struct sk_buff *skb) { >- struct ieee80211vap *vap = skb->dev->priv; >+ struct ieee80211vap *vap = netdev_priv(skb->dev); > > vap->iv_devstats.tx_packets++; >Index: /madwifi/branches/madwifi-0.9.4/net80211/ieee80211_linux.c >=================================================================== >--- /madwifi/branches/madwifi-0.9.4/net80211/ieee80211_linux.c (revision 3880) >+++ /madwifi/branches/madwifi-0.9.4/net80211/ieee80211_linux.c (revision 3907) >@@ -141,5 +141,5 @@ > ieee80211_vlan_register(struct net_device *dev, struct vlan_group *grp) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > > vap->iv_vlgrp = grp; >@@ -152,5 +152,5 @@ > ieee80211_vlan_add_vid(struct net_device *dev, unsigned short vid) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > > if (vap->iv_vlgrp != NULL) >@@ -164,5 +164,5 @@ > ieee80211_vlan_kill_vid(struct net_device *dev, unsigned short vid) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > > if (vap->iv_vlgrp != NULL) >@@ -334,5 +334,5 @@ > ieee80211_load_module(const char *modname) > { >-#ifdef CONFIG_KMOD >+#if defined(CONFIG_KMOD) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)) > int rv; > rv = request_module("%s", modname); >@@ -341,9 +341,9 @@ > "errno: %d\n", modname, rv); > return rv; >-#else /* CONFIG_KMOD */ >+#else /* CONFIG_KMOD || 2.6.27+ */ > printk(KERN_ERR "Unable to load needed module: %s; no support for " \ > "automatic module loading", modname ); > return -ENOSYS; >-#endif /* CONFIG_KMOD */ >+#endif /* CONFIG_KMOD || 2.6.27+ */ > } > >@@ -900,6 +900,6 @@ > switch (event) { > case NETDEV_CHANGENAME: >- ieee80211_sysctl_vdetach(dev->priv); >- ieee80211_sysctl_vattach(dev->priv); >+ ieee80211_sysctl_vdetach(netdev_priv(dev)); >+ ieee80211_sysctl_vattach(netdev_priv(dev)); > return NOTIFY_DONE; > default: >Index: /madwifi/branches/madwifi-0.9.4/net80211/ieee80211_proto.c >=================================================================== >--- /madwifi/branches/madwifi-0.9.4/net80211/ieee80211_proto.c (revision 3079) >+++ /madwifi/branches/madwifi-0.9.4/net80211/ieee80211_proto.c (revision 3907) >@@ -947,5 +947,5 @@ > #define IS_RUNNING(_dev) \ > ((_dev->flags & (IFF_RUNNING|IFF_UP)) == (IFF_RUNNING|IFF_UP)) >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > struct net_device *parent = ic->ic_dev; >@@ -1044,5 +1044,5 @@ > ieee80211_stop(struct net_device *dev) > { >- struct ieee80211vap *vap = dev->priv; >+ struct ieee80211vap *vap = netdev_priv(dev); > struct ieee80211com *ic = vap->iv_ic; > struct net_device *parent = ic->ic_dev; >Index: /madwifi/branches/madwifi-0.9.4/include/compat.h >=================================================================== >--- /madwifi/branches/madwifi-0.9.4/include/compat.h (revision 3880) >+++ /madwifi/branches/madwifi-0.9.4/include/compat.h (revision 3907) >@@ -154,4 +154,8 @@ > #endif > >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,27) >+#define netdev_priv(_netdev) ((_netdev)->priv) >+#endif >+ > #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) > #define skb_end_pointer(_skb) ((_skb)->end) >Index: /madwifi/branches/madwifi-0.9.4/ath_rate/onoe/onoe.c >=================================================================== >--- /madwifi/branches/madwifi-0.9.4/ath_rate/onoe/onoe.c (revision 2815) >+++ /madwifi/branches/madwifi-0.9.4/ath_rate/onoe/onoe.c (revision 3907) >@@ -290,5 +290,5 @@ > ath_rate_cb(void *arg, struct ieee80211_node *ni) > { >- ath_rate_update(ni->ni_ic->ic_dev->priv, ni, (long) arg); >+ ath_rate_update(netdev_priv(ni->ni_ic->ic_dev), ni, (long) arg); > } > >@@ -300,5 +300,5 @@ > { > struct ieee80211com *ic = vap->iv_ic; >- struct ath_softc *sc = ic->ic_dev->priv; >+ struct ath_softc *sc = netdev_priv(ic->ic_dev); > struct ieee80211_node *ni; > >Index: /madwifi/branches/madwifi-0.9.4/ath_rate/amrr/amrr.c >=================================================================== >--- /madwifi/branches/madwifi-0.9.4/ath_rate/amrr/amrr.c (revision 2815) >+++ /madwifi/branches/madwifi-0.9.4/ath_rate/amrr/amrr.c (revision 3907) >@@ -304,5 +304,5 @@ > ath_rate_cb(void *arg, struct ieee80211_node *ni) > { >- ath_rate_update(ni->ni_ic->ic_dev->priv, ni, (long) arg); >+ ath_rate_update(netdev_priv(ni->ni_ic->ic_dev), ni, (long) arg); > } > >@@ -314,5 +314,5 @@ > { > struct ieee80211com *ic = vap->iv_ic; >- struct ath_softc *sc = ic->ic_dev->priv; >+ struct ath_softc *sc = netdev_priv(ic->ic_dev); > struct amrr_softc *asc = (struct amrr_softc *) sc->sc_rc; > struct ieee80211_node *ni; >@@ -426,5 +426,5 @@ > { > struct net_device *dev = (struct net_device *)data; >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > struct amrr_softc *asc = (struct amrr_softc *)sc->sc_rc; > struct ieee80211com *ic = &sc->sc_ic; >Index: /madwifi/branches/madwifi-0.9.4/ath_rate/sample/sample.c >=================================================================== >--- /madwifi/branches/madwifi-0.9.4/ath_rate/sample/sample.c (revision 2161) >+++ /madwifi/branches/madwifi-0.9.4/ath_rate/sample/sample.c (revision 3907) >@@ -883,5 +883,5 @@ > ath_rate_cb(void *arg, struct ieee80211_node *ni) > { >- ath_rate_ctl_reset(ni->ni_ic->ic_dev->priv, ni); >+ ath_rate_ctl_reset(netdev_priv(ni->ni_ic->ic_dev), ni); > } > >@@ -901,5 +901,5 @@ > ieee80211_iterate_nodes(&ic->ic_sta, ath_rate_cb, NULL); > } >- ath_rate_newassoc(ic->ic_dev->priv, ATH_NODE(vap->iv_bss), 1); >+ ath_rate_newassoc(netdev_priv(ic->ic_dev), ATH_NODE(vap->iv_bss), 1); > } > } >Index: /madwifi/branches/madwifi-0.9.4/ath_rate/minstrel/minstrel.c >=================================================================== >--- /madwifi/branches/madwifi-0.9.4/ath_rate/minstrel/minstrel.c (revision 3844) >+++ /madwifi/branches/madwifi-0.9.4/ath_rate/minstrel/minstrel.c (revision 3907) >@@ -737,5 +737,5 @@ > ath_rate_cb(void *arg, struct ieee80211_node *ni) > { >- ath_rate_ctl_reset(ni->ni_ic->ic_dev->priv, ni); >+ ath_rate_ctl_reset(netdev_priv(ni->ni_ic->ic_dev), ni); > } > >@@ -751,5 +751,5 @@ > ieee80211_iterate_nodes(&ic->ic_sta, ath_rate_cb, NULL); > } >- ath_rate_newassoc(ic->ic_dev->priv, ATH_NODE(vap->iv_bss), 1); >+ ath_rate_newassoc(netdev_priv(ic->ic_dev), ATH_NODE(vap->iv_bss), 1); > } > } >@@ -936,5 +936,5 @@ > unsigned int x = 0; > unsigned int this_tp, this_prob, this_eprob; >- struct ath_softc *sc = vap->iv_ic->ic_dev->priv;; >+ struct ath_softc *sc = netdev_priv(vap->iv_ic->ic_dev); > > TAILQ_FOREACH(ni, &nt->nt_node, ni_list) { >Index: /madwifi/branches/madwifi-0.9.4/ath/if_ath_ahb.c >=================================================================== >--- /madwifi/branches/madwifi-0.9.4/ath/if_ath_ahb.c (revision 3052) >+++ /madwifi/branches/madwifi-0.9.4/ath/if_ath_ahb.c (revision 3907) >@@ -322,5 +322,5 @@ > goto bad2; > } >- sc = dev->priv; >+ sc = netdev_priv(dev); > sc->aps_sc.sc_dev = dev; > >Index: /madwifi/branches/madwifi-0.9.4/ath/if_ath_pci.c >=================================================================== >--- /madwifi/branches/madwifi-0.9.4/ath/if_ath_pci.c (revision 3826) >+++ /madwifi/branches/madwifi-0.9.4/ath/if_ath_pci.c (revision 3907) >@@ -213,5 +213,5 @@ > goto bad2; > } >- sc = dev->priv; >+ sc = netdev_priv(dev); > sc->aps_sc.sc_dev = dev; > sc->aps_sc.sc_iobase = mem; >@@ -294,5 +294,5 @@ > { > struct net_device *dev = pci_get_drvdata(pdev); >- struct ath_pci_softc *sc = dev->priv; >+ struct ath_pci_softc *sc = netdev_priv(dev); > > ath_detach(dev); >@@ -312,5 +312,5 @@ > > ath_suspend(dev); >- PCI_SAVE_STATE(pdev, ((struct ath_pci_softc *)dev->priv)->aps_pmstate); >+ PCI_SAVE_STATE(pdev, ((struct ath_pci_softc *)netdev_priv(dev))->aps_pmstate); > pci_disable_device(pdev); > return pci_set_power_state(pdev, PCI_D3hot); >@@ -329,5 +329,5 @@ > > /* XXX - Should this return nonzero on fail? */ >- PCI_RESTORE_STATE(pdev, ((struct ath_pci_softc *)dev->priv)->aps_pmstate); >+ PCI_RESTORE_STATE(pdev, ((struct ath_pci_softc *)netdev_priv(dev))->aps_pmstate); > > err = pci_enable_device(pdev); >Index: /madwifi/branches/madwifi-0.9.4/ath/if_ath.c >=================================================================== >--- /madwifi/branches/madwifi-0.9.4/ath/if_ath.c (revision 3354) >+++ /madwifi/branches/madwifi-0.9.4/ath/if_ath.c (revision 3907) >@@ -400,5 +400,5 @@ > ath_attach(u_int16_t devid, struct net_device *dev, HAL_BUS_TAG tag) > { >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > struct ieee80211com *ic = &sc->sc_ic; > struct ath_hal *ah; >@@ -956,5 +956,5 @@ > ath_detach(struct net_device *dev) > { >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > struct ath_hal *ah = sc->sc_ah; > >@@ -1012,5 +1012,5 @@ > int opmode, int flags, struct net_device *mdev) > { >- struct ath_softc *sc = ic->ic_dev->priv; >+ struct ath_softc *sc = netdev_priv(ic->ic_dev); > struct ath_hal *ah = sc->sc_ah; > struct net_device *dev; >@@ -1082,5 +1082,5 @@ > } > >- avp = dev->priv; >+ avp = netdev_priv(dev); > ieee80211_vap_setup(ic, dev, name, unit, opmode, flags); > /* override with driver methods */ >@@ -1246,5 +1246,5 @@ > { > struct net_device *dev = vap->iv_ic->ic_dev; >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > struct ath_hal *ah = sc->sc_ah; > struct ath_vap *avp = ATH_VAP(vap); >@@ -1348,5 +1348,5 @@ > ath_suspend(struct net_device *dev) > { >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > > DPRINTF(sc, ATH_DEBUG_ANY, "%s: flags %x\n", __func__, dev->flags); >@@ -1357,5 +1357,5 @@ > ath_resume(struct net_device *dev) > { >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > > DPRINTF(sc, ATH_DEBUG_ANY, "%s: flags %x\n", __func__, dev->flags); >@@ -1650,5 +1650,5 @@ > { > struct net_device *dev = dev_id; >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > struct ath_hal *ah = sc->sc_ah; > HAL_INT status; >@@ -1841,5 +1841,5 @@ > { > struct net_device *dev = (struct net_device *)data; >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > > if (time_before(jiffies, sc->sc_ic.ic_bmiss_guard)) { >@@ -1884,5 +1884,5 @@ > ath_init(struct net_device *dev) > { >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > struct ieee80211com *ic = &sc->sc_ic; > struct ath_hal *ah = sc->sc_ah; >@@ -2012,5 +2012,5 @@ > ath_stop_locked(struct net_device *dev) > { >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > struct ieee80211com *ic = &sc->sc_ic; > struct ath_hal *ah = sc->sc_ah; >@@ -2076,5 +2076,5 @@ > ath_stop(struct net_device *dev) > { >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > int error; > >@@ -2180,5 +2180,5 @@ > ath_reset(struct net_device *dev) > { >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > struct ieee80211com *ic = &sc->sc_ic; > struct ath_hal *ah = sc->sc_ah; >@@ -2341,5 +2341,5 @@ > ath_tx_startraw(struct net_device *dev, struct ath_buf *bf, struct sk_buff *skb) > { >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > struct ath_hal *ah = sc->sc_ah; > struct ieee80211_phy_params *ph = (struct ieee80211_phy_params *) (skb->cb + sizeof(struct ieee80211_cb)); >@@ -2556,5 +2556,5 @@ > ath_hardstart(struct sk_buff *skb, struct net_device *dev) > { >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > struct ieee80211_node *ni = NULL; > struct ath_buf *bf = NULL; >@@ -2873,5 +2873,5 @@ > { > struct net_device *dev = ic->ic_dev; >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > struct ieee80211_node *ni = NULL; > struct ath_buf *bf = NULL; >@@ -3235,5 +3235,5 @@ > { > struct net_device *dev = vap->iv_ic->ic_dev; >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > > /* >@@ -3302,5 +3302,5 @@ > { > struct net_device *dev = vap->iv_ic->ic_dev; >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > struct ath_hal *ah = sc->sc_ah; > const struct ieee80211_cipher *cip = k->wk_cipher; >@@ -3378,5 +3378,5 @@ > { > struct net_device *dev = vap->iv_ic->ic_dev; >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > > return ath_keyset(sc, k, mac, vap->iv_bss); >@@ -3393,5 +3393,5 @@ > { > struct net_device *dev = vap->iv_ic->ic_dev; >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > > DPRINTF(sc, ATH_DEBUG_KEYCACHE, "%s:\n", __func__); >@@ -3414,5 +3414,5 @@ > { > struct net_device *dev = vap->iv_ic->ic_dev; >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > > DPRINTF(sc, ATH_DEBUG_KEYCACHE, "%s:\n", __func__); >@@ -3502,5 +3502,5 @@ > ath_mode_init(struct net_device *dev) > { >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > struct ath_hal *ah = sc->sc_ah; > u_int32_t rfilt, mfilt[2]; >@@ -3553,5 +3553,5 @@ > ath_updateslot(struct net_device *dev) > { >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > struct ieee80211com *ic = &sc->sc_ic; > >@@ -3583,5 +3583,5 @@ > (IEEE80211_ATHC_TURBOP)) > struct ieee80211com *ic = vap->iv_ic; >- struct ath_softc *sc = ic->ic_dev->priv; >+ struct ath_softc *sc = netdev_priv(ic->ic_dev); > > if (ic->ic_opmode == IEEE80211_M_HOSTAP && IS_CAPABLE(vap)) { >@@ -3631,5 +3631,5 @@ > { > struct ieee80211com *ic = vap->iv_ic; >- struct ath_softc *sc = ic->ic_dev->priv; >+ struct ath_softc *sc = netdev_priv(ic->ic_dev); > u_int32_t bss_traffic; > >@@ -3774,5 +3774,5 @@ > { > struct net_device *dev = (struct net_device *)data; >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > struct ieee80211com *ic = &sc->sc_ic; > int newflags; >@@ -4366,5 +4366,5 @@ > { > struct net_device *dev = (struct net_device *)data; >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > /* > * XXX:if the bmisscount is cleared while the >@@ -4818,5 +4818,5 @@ > ath_node_alloc(struct ieee80211_node_table *nt,struct ieee80211vap *vap) > { >- struct ath_softc *sc = nt->nt_ic->ic_dev->priv; >+ struct ath_softc *sc = netdev_priv(nt->nt_ic->ic_dev); > const size_t space = sizeof(struct ath_node) + sc->sc_rc->arc_space; > struct ath_node *an; >@@ -4853,5 +4853,5 @@ > { > struct ieee80211com *ic = ni->ni_ic; >- struct ath_softc *sc = ni->ni_ic->ic_dev->priv; >+ struct ath_softc *sc = netdev_priv(ni->ni_ic->ic_dev); > struct ath_node *an = ATH_NODE(ni); > struct ath_buf *bf; >@@ -4907,5 +4907,5 @@ > ath_node_free(struct ieee80211_node *ni) > { >- struct ath_softc *sc = ni->ni_ic->ic_dev->priv; >+ struct ath_softc *sc = netdev_priv(ni->ni_ic->ic_dev); > > sc->sc_rc->ops->node_cleanup(sc, ATH_NODE(ni)); >@@ -4950,5 +4950,5 @@ > struct ath_txq *txq = NULL; > struct ieee80211com *ic = ni->ni_ic; >- struct ath_softc *sc = ic->ic_dev->priv; >+ struct ath_softc *sc = netdev_priv(ic->ic_dev); > struct ath_buf *bf, *prev, *bf_tmp, *bf_tmp1; > struct ath_hal *ah = sc->sc_ah; >@@ -5402,5 +5402,5 @@ > ath_rx_capture(struct net_device *dev, struct ath_desc *ds, struct sk_buff *skb) > { >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > struct ieee80211com *ic = &sc->sc_ic; > struct ieee80211_frame *wh = (struct ieee80211_frame *) skb->data; >@@ -5435,5 +5435,5 @@ > ath_tx_capture(struct net_device *dev, struct ath_desc *ds, struct sk_buff *skb) > { >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > struct ieee80211com *ic = &sc->sc_ic; > struct ieee80211_frame *wh; >@@ -5500,5 +5500,5 @@ > int subtype, int rssi, u_int32_t rstamp) > { >- struct ath_softc *sc = ni->ni_ic->ic_dev->priv; >+ struct ath_softc *sc = netdev_priv(ni->ni_ic->ic_dev); > struct ieee80211vap *vap = ni->ni_vap; > >@@ -5572,5 +5572,5 @@ > struct net_device *dev = (struct net_device *)data; > struct ath_buf *bf; >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > struct ieee80211com *ic = &sc->sc_ic; > struct ath_hal *ah = sc->sc_ah; >@@ -6011,5 +6011,5 @@ > struct ath_buf *bf, *head = NULL; > struct ieee80211com *ic = vap->iv_ic; >- struct ath_softc *sc = ic->ic_dev->priv; >+ struct ath_softc *sc = netdev_priv(ic->ic_dev); > struct ath_hal *ah = sc->sc_ah; > u_int8_t rate; >@@ -6224,5 +6224,5 @@ > { > struct ieee80211com *ic = vap->iv_ic; >- struct ath_softc *sc = ic->ic_dev->priv; >+ struct ath_softc *sc = netdev_priv(ic->ic_dev); > struct ath_hal *ah = sc->sc_ah; > struct ath_txq *txq = &sc->sc_grpplq; >@@ -6439,5 +6439,5 @@ > ath_wme_update(struct ieee80211com *ic) > { >- struct ath_softc *sc = ic->ic_dev->priv; >+ struct ath_softc *sc = netdev_priv(ic->ic_dev); > > if (sc->sc_uapsdq) >@@ -6458,5 +6458,5 @@ > struct ath_node *an = ATH_NODE(ni); > struct ath_buf *bf; >- struct ath_softc *sc = ni->ni_ic->ic_dev->priv; >+ struct ath_softc *sc = netdev_priv(ni->ni_ic->ic_dev); > struct ath_txq *txq; > >@@ -6653,5 +6653,5 @@ > { > #define MIN(a,b) ((a) < (b) ? (a) : (b)) >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > struct ieee80211com *ic = ni->ni_ic; > struct ieee80211vap *vap = ni->ni_vap; >@@ -7493,5 +7493,5 @@ > { > struct net_device *dev = (struct net_device *)data; >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > > if (txqactive(sc->sc_ah, 0)) >@@ -7514,5 +7514,5 @@ > { > struct net_device *dev = (struct net_device *)data; >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > > /* >@@ -7549,5 +7549,5 @@ > { > struct net_device *dev = (struct net_device *)data; >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > int i; > >@@ -7572,5 +7572,5 @@ > ath_tx_timeout(struct net_device *dev) > { >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > > DPRINTF(sc, ATH_DEBUG_WATCHDOG, "%s: %sRUNNING %svalid\n", >@@ -7935,5 +7935,5 @@ > { > struct net_device *dev = (struct net_device *) arg; >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > struct ath_hal *ah = sc->sc_ah; > struct ieee80211com *ic = &sc->sc_ic; >@@ -8001,5 +8001,5 @@ > { > struct net_device *dev = ic->ic_dev; >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > struct ath_hal *ah = sc->sc_ah; > u_int32_t rfilt; >@@ -8021,5 +8021,5 @@ > { > struct net_device *dev = ic->ic_dev; >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > struct ath_hal *ah = sc->sc_ah; > u_int32_t rfilt; >@@ -8039,5 +8039,5 @@ > { > struct net_device *dev = ic->ic_dev; >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > > (void) ath_chan_set(sc, ic->ic_curchan); >@@ -8055,5 +8055,5 @@ > ath_set_coverageclass(struct ieee80211com *ic) > { >- struct ath_softc *sc = ic->ic_dev->priv; >+ struct ath_softc *sc = netdev_priv(ic->ic_dev); > > ath_hal_setcoverageclass(sc->sc_ah, ic->ic_coverageclass, 0); >@@ -8065,5 +8065,5 @@ > ath_mhz2ieee(struct ieee80211com *ic, u_int freq, u_int flags) > { >- struct ath_softc *sc = ic->ic_dev->priv; >+ struct ath_softc *sc = netdev_priv(ic->ic_dev); > > return (ath_hal_mhz2ieee(sc->sc_ah, freq, flags)); >@@ -8080,5 +8080,5 @@ > struct ieee80211com *ic = vap->iv_ic; > struct net_device *dev = ic->ic_dev; >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > struct ath_hal *ah = sc->sc_ah; > struct ieee80211_node *ni, *wds_ni; >@@ -8415,5 +8415,5 @@ > #define IEEE80211_KEY_XR (IEEE80211_KEY_XMIT | IEEE80211_KEY_RECV) > struct ieee80211vap *vap = ni->ni_vap; >- struct ath_softc *sc = vap->iv_ic->ic_dev->priv; >+ struct ath_softc *sc = netdev_priv(vap->iv_ic->ic_dev); > struct ath_node *an = ATH_NODE(ni); > u_int16_t keyindex; >@@ -8469,5 +8469,5 @@ > { > struct ieee80211vap *vap = ni->ni_vap; >- struct ath_softc *sc = vap->iv_ic->ic_dev->priv; >+ struct ath_softc *sc = netdev_priv(vap->iv_ic->ic_dev); > u_int16_t keyix; > >@@ -8629,5 +8629,5 @@ > struct ieee80211com *ic = ni->ni_ic; > struct ieee80211vap *vap = ni->ni_vap; >- struct ath_softc *sc = ic->ic_dev->priv; >+ struct ath_softc *sc = netdev_priv(ic->ic_dev); > > sc->sc_rc->ops->newassoc(sc, ATH_NODE(ni), isnew); >@@ -8660,5 +8660,5 @@ > HAL_BOOL outdoor, HAL_BOOL xchanmode) > { >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > struct ieee80211com *ic = &sc->sc_ic; > struct ath_hal *ah = sc->sc_ah; >@@ -8830,5 +8830,5 @@ > ath_xr_rate_setup(struct net_device *dev) > { >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > struct ath_hal *ah = sc->sc_ah; > struct ieee80211com *ic = &sc->sc_ic; >@@ -8859,5 +8859,5 @@ > ath_setup_subrates(struct net_device *dev) > { >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > struct ath_hal *ah = sc->sc_ah; > struct ieee80211com *ic = &sc->sc_ic; >@@ -8902,5 +8902,5 @@ > ath_rate_setup(struct net_device *dev, u_int mode) > { >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > struct ath_hal *ah = sc->sc_ah; > struct ieee80211com *ic = &sc->sc_ic; >@@ -9139,5 +9139,5 @@ > ath_getstats(struct net_device *dev) > { >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > struct net_device_stats *stats = &sc->sc_devstats; > >@@ -9162,5 +9162,5 @@ > ath_set_mac_address(struct net_device *dev, void *addr) > { >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > struct ieee80211com *ic = &sc->sc_ic; > struct ath_hal *ah = sc->sc_ah; >@@ -9194,5 +9194,5 @@ > ath_change_mtu(struct net_device *dev, int mtu) > { >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > int error = 0; > >@@ -9281,5 +9281,5 @@ > ath_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) > { >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > struct ieee80211com *ic = &sc->sc_ic; > int error; >@@ -9777,5 +9777,5 @@ > { > #define HAL_MODE_DUALBAND (HAL_MODE_11A|HAL_MODE_11B) >- struct ath_softc *sc = dev->priv; >+ struct ath_softc *sc = netdev_priv(dev); > struct ath_hal *ah = sc->sc_ah; > u_int modes, cc; >@@ -9924,5 +9924,5 @@ > { > struct net_device *dev = (struct net_device *) ptr; >- struct ath_softc *sc = (struct ath_softc *) dev->priv; >+ struct ath_softc *sc = (struct ath_softc *) netdev_priv(dev); > > if (!dev || !sc || dev->open != &ath_init)
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=186314">View the attachment on a separate page</a>.</b>
View Attachment As Raw
Actions:
View
Attachments on
bug 262761
:
185252
|
186153
|
186313
| 186314 |
187820
|
187822
|
188087
|
192965
