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

Commit 524ad0a7 authored by Wang Chen's avatar Wang Chen Committed by David S. Miller
Browse files

netdevice: safe convert to netdev_priv() #part-4 



We have some reasons to kill netdev->priv:
1. netdev->priv is equal to netdev_priv().
2. netdev_priv() wraps the calculation of netdev->priv's offset, obviously
   netdev_priv() is more flexible than netdev->priv.
But we cann't kill netdev->priv, because so many drivers reference to it
directly.

This patch is a safe convert for netdev->priv to netdev_priv(netdev).
Since all of the netdev->priv is only for read.
But it is too big to be sent in one mail.
I split it to 4 parts and make every part smaller than 100,000 bytes,
which is max size allowed by vger.

Signed-off-by: default avatarWang Chen <wangchen@cn.fujitsu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8f15ea42

drivers/net/wireless/libertas/wext.c

+36 −36
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static int lbs_get_name(struct net_device *dev, struct iw_request_info *info, 
static int lbs_get_freq(struct net_device *dev, struct iw_request_info *info,

			 struct iw_freq *fwrq, char *extra)

{

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);

	struct chan_freq_power *cfp;



	lbs_deb_enter(LBS_DEB_WEXT);
@@ -189,7 +189,7 @@ static int lbs_get_freq(struct net_device *dev, struct iw_request_info *info, 
static int lbs_get_wap(struct net_device *dev, struct iw_request_info *info,

			struct sockaddr *awrq, char *extra)

{

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);



	lbs_deb_enter(LBS_DEB_WEXT);
@@ -207,7 +207,7 @@ static int lbs_get_wap(struct net_device *dev, struct iw_request_info *info, 
static int lbs_set_nick(struct net_device *dev, struct iw_request_info *info,

			 struct iw_point *dwrq, char *extra)

{

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);



	lbs_deb_enter(LBS_DEB_WEXT);
@@ -231,7 +231,7 @@ static int lbs_set_nick(struct net_device *dev, struct iw_request_info *info, 
static int lbs_get_nick(struct net_device *dev, struct iw_request_info *info,

			 struct iw_point *dwrq, char *extra)

{

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);



	lbs_deb_enter(LBS_DEB_WEXT);
@@ -248,7 +248,7 @@ static int lbs_get_nick(struct net_device *dev, struct iw_request_info *info, 
static int mesh_get_nick(struct net_device *dev, struct iw_request_info *info,

			 struct iw_point *dwrq, char *extra)

{

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);



	lbs_deb_enter(LBS_DEB_WEXT);
@@ -273,7 +273,7 @@ static int lbs_set_rts(struct net_device *dev, struct iw_request_info *info, 
			struct iw_param *vwrq, char *extra)

{

	int ret = 0;

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);

	u32 val = vwrq->value;



	lbs_deb_enter(LBS_DEB_WEXT);
@@ -293,7 +293,7 @@ static int lbs_set_rts(struct net_device *dev, struct iw_request_info *info, 
static int lbs_get_rts(struct net_device *dev, struct iw_request_info *info,

			struct iw_param *vwrq, char *extra)

{

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);

	int ret = 0;

	u16 val = 0;
@@ -315,7 +315,7 @@ out: 
static int lbs_set_frag(struct net_device *dev, struct iw_request_info *info,

			 struct iw_param *vwrq, char *extra)

{

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);

	int ret = 0;

	u32 val = vwrq->value;
@@ -336,7 +336,7 @@ static int lbs_set_frag(struct net_device *dev, struct iw_request_info *info, 
static int lbs_get_frag(struct net_device *dev, struct iw_request_info *info,

			 struct iw_param *vwrq, char *extra)

{

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);

	int ret = 0;

	u16 val = 0;
@@ -359,7 +359,7 @@ out: 
static int lbs_get_mode(struct net_device *dev,

			 struct iw_request_info *info, u32 * uwrq, char *extra)

{

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);



	lbs_deb_enter(LBS_DEB_WEXT);
@@ -385,7 +385,7 @@ static int lbs_get_txpow(struct net_device *dev, 
			  struct iw_request_info *info,

			  struct iw_param *vwrq, char *extra)

{

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);

	s16 curlevel = 0;

	int ret = 0;
@@ -418,7 +418,7 @@ out: 
static int lbs_set_retry(struct net_device *dev, struct iw_request_info *info,

			  struct iw_param *vwrq, char *extra)

{

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);

	int ret = 0;

	u16 slimit = 0, llimit = 0;
@@ -466,7 +466,7 @@ out: 
static int lbs_get_retry(struct net_device *dev, struct iw_request_info *info,

			  struct iw_param *vwrq, char *extra)

{

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);

	int ret = 0;

	u16 val = 0;
@@ -542,7 +542,7 @@ static int lbs_get_range(struct net_device *dev, struct iw_request_info *info, 
			  struct iw_point *dwrq, char *extra)

{

	int i, j;

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);

	struct iw_range *range = (struct iw_range *)extra;

	struct chan_freq_power *cfp;

	u8 rates[MAX_RATES + 1];
@@ -708,7 +708,7 @@ out: 
static int lbs_set_power(struct net_device *dev, struct iw_request_info *info,

			  struct iw_param *vwrq, char *extra)

{

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);



	lbs_deb_enter(LBS_DEB_WEXT);
@@ -758,7 +758,7 @@ static int lbs_set_power(struct net_device *dev, struct iw_request_info *info, 
static int lbs_get_power(struct net_device *dev, struct iw_request_info *info,

			  struct iw_param *vwrq, char *extra)

{

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);



	lbs_deb_enter(LBS_DEB_WEXT);
@@ -781,7 +781,7 @@ static struct iw_statistics *lbs_get_wireless_stats(struct net_device *dev) 
		EXCELLENT = 95,

		PERFECT = 100

	};

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);

	u32 rssi_qual;

	u32 tx_qual;

	u32 quality = 0;
@@ -886,7 +886,7 @@ static int lbs_set_freq(struct net_device *dev, struct iw_request_info *info, 
		  struct iw_freq *fwrq, char *extra)

{

	int ret = -EINVAL;

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);

	struct chan_freq_power *cfp;

	struct assoc_request * assoc_req;
@@ -943,7 +943,7 @@ static int lbs_mesh_set_freq(struct net_device *dev, 
			     struct iw_request_info *info,

			     struct iw_freq *fwrq, char *extra)

{

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);

	struct chan_freq_power *cfp;

	int ret = -EINVAL;
@@ -994,7 +994,7 @@ out: 
static int lbs_set_rate(struct net_device *dev, struct iw_request_info *info,

		  struct iw_param *vwrq, char *extra)

{

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);

	u8 new_rate = 0;

	int ret = -EINVAL;

	u8 rates[MAX_RATES + 1];
@@ -1054,7 +1054,7 @@ out: 
static int lbs_get_rate(struct net_device *dev, struct iw_request_info *info,

		  struct iw_param *vwrq, char *extra)

{

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);



	lbs_deb_enter(LBS_DEB_WEXT);
@@ -1079,7 +1079,7 @@ static int lbs_set_mode(struct net_device *dev, 
		  struct iw_request_info *info, u32 * uwrq, char *extra)

{

	int ret = 0;

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);

	struct assoc_request * assoc_req;



	lbs_deb_enter(LBS_DEB_WEXT);
@@ -1124,7 +1124,7 @@ static int lbs_get_encode(struct net_device *dev, 
			   struct iw_request_info *info,

			   struct iw_point *dwrq, u8 * extra)

{

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);

	int index = (dwrq->flags & IW_ENCODE_INDEX) - 1;



	lbs_deb_enter(LBS_DEB_WEXT);
@@ -1319,7 +1319,7 @@ static int lbs_set_encode(struct net_device *dev, 
		    struct iw_point *dwrq, char *extra)

{

	int ret = 0;

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);

	struct assoc_request * assoc_req;

	u16 is_default = 0, index = 0, set_tx_key = 0;
@@ -1395,7 +1395,7 @@ static int lbs_get_encodeext(struct net_device *dev, 
			      char *extra)

{

	int ret = -EINVAL;

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);

	struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;

	int index, max_key_len;
@@ -1501,7 +1501,7 @@ static int lbs_set_encodeext(struct net_device *dev, 
			      char *extra)

{

	int ret = 0;

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);

	struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;

	int alg = ext->alg;

	struct assoc_request * assoc_req;
@@ -1639,7 +1639,7 @@ static int lbs_set_genie(struct net_device *dev, 
			  struct iw_point *dwrq,

			  char *extra)

{

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);

	int ret = 0;

	struct assoc_request * assoc_req;
@@ -1685,7 +1685,7 @@ static int lbs_get_genie(struct net_device *dev, 
			  char *extra)

{

	int ret = 0;

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);



	lbs_deb_enter(LBS_DEB_WEXT);
@@ -1713,7 +1713,7 @@ static int lbs_set_auth(struct net_device *dev, 
			 struct iw_param *dwrq,

			 char *extra)

{

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);

	struct assoc_request * assoc_req;

	int ret = 0;

	int updated = 0;
@@ -1816,7 +1816,7 @@ static int lbs_get_auth(struct net_device *dev, 
			 char *extra)

{

	int ret = 0;

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);



	lbs_deb_enter(LBS_DEB_WEXT);
@@ -1857,7 +1857,7 @@ static int lbs_set_txpow(struct net_device *dev, struct iw_request_info *info, 
		   struct iw_param *vwrq, char *extra)

{

	int ret = 0;

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);

	s16 dbm = (s16) vwrq->value;



	lbs_deb_enter(LBS_DEB_WEXT);
@@ -1936,7 +1936,7 @@ out: 
static int lbs_get_essid(struct net_device *dev, struct iw_request_info *info,

		   struct iw_point *dwrq, char *extra)

{

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);



	lbs_deb_enter(LBS_DEB_WEXT);
@@ -1971,7 +1971,7 @@ static int lbs_get_essid(struct net_device *dev, struct iw_request_info *info, 
static int lbs_set_essid(struct net_device *dev, struct iw_request_info *info,

		   struct iw_point *dwrq, char *extra)

{

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);

	int ret = 0;

	u8 ssid[IW_ESSID_MAX_SIZE];

	u8 ssid_len = 0;
@@ -2040,7 +2040,7 @@ static int lbs_mesh_get_essid(struct net_device *dev, 
			      struct iw_request_info *info,

			      struct iw_point *dwrq, char *extra)

{

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);



	lbs_deb_enter(LBS_DEB_WEXT);
@@ -2058,7 +2058,7 @@ static int lbs_mesh_set_essid(struct net_device *dev, 
			      struct iw_request_info *info,

			      struct iw_point *dwrq, char *extra)

{

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);

	int ret = 0;



	lbs_deb_enter(LBS_DEB_WEXT);
@@ -2102,7 +2102,7 @@ static int lbs_mesh_set_essid(struct net_device *dev, 
static int lbs_set_wap(struct net_device *dev, struct iw_request_info *info,

		 struct sockaddr *awrq, char *extra)

{

	struct lbs_private *priv = dev->priv;

	struct lbs_private *priv = netdev_priv(dev);

	struct assoc_request * assoc_req;

	int ret = 0;

drivers/net/wireless/rndis_wlan.c

+31 −31
Original line number Diff line number Diff line
@@ -1104,7 +1104,7 @@ static int rndis_iw_get_range(struct net_device *dev, 
    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)

{

	struct iw_range *range = (struct iw_range *)extra;

	struct usbnet *usbdev = dev->priv;

	struct usbnet *usbdev = netdev_priv(dev);

	struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);

	int len, ret, i, j, num, has_80211g_rates;

	u8 rates[8];
@@ -1210,7 +1210,7 @@ static int rndis_iw_get_range(struct net_device *dev, 
static int rndis_iw_get_name(struct net_device *dev,

    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)

{

	struct usbnet *usbdev = dev->priv;

	struct usbnet *usbdev = netdev_priv(dev);

	struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);



	strcpy(wrqu->name, priv->name);
@@ -1223,7 +1223,7 @@ static int rndis_iw_set_essid(struct net_device *dev, 
{

	struct ndis_80211_ssid ssid;

	int length = wrqu->essid.length;

	struct usbnet *usbdev = dev->priv;

	struct usbnet *usbdev = netdev_priv(dev);



	devdbg(usbdev, "SIOCSIWESSID: [flags:%d,len:%d] '%.32s'",

		wrqu->essid.flags, wrqu->essid.length, essid);
@@ -1250,7 +1250,7 @@ static int rndis_iw_get_essid(struct net_device *dev, 
    struct iw_request_info *info, union iwreq_data *wrqu, char *essid)

{

	struct ndis_80211_ssid ssid;

	struct usbnet *usbdev = dev->priv;

	struct usbnet *usbdev = netdev_priv(dev);

	int ret;



	ret = get_essid(usbdev, &ssid);
@@ -1273,7 +1273,7 @@ static int rndis_iw_get_essid(struct net_device *dev, 
static int rndis_iw_get_bssid(struct net_device *dev,

    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)

{

	struct usbnet *usbdev = dev->priv;

	struct usbnet *usbdev = netdev_priv(dev);

	unsigned char bssid[ETH_ALEN];

	int ret;
@@ -1294,7 +1294,7 @@ static int rndis_iw_get_bssid(struct net_device *dev, 
static int rndis_iw_set_bssid(struct net_device *dev,

    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)

{

	struct usbnet *usbdev = dev->priv;

	struct usbnet *usbdev = netdev_priv(dev);

	u8 *bssid = (u8 *)wrqu->ap_addr.sa_data;

	int ret;
@@ -1316,7 +1316,7 @@ static int rndis_iw_set_auth(struct net_device *dev, 
    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)

{

	struct iw_param *p = &wrqu->param;

	struct usbnet *usbdev = dev->priv;

	struct usbnet *usbdev = netdev_priv(dev);

	struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);

	int ret = -ENOTSUPP;
@@ -1397,7 +1397,7 @@ static int rndis_iw_get_auth(struct net_device *dev, 
    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)

{

	struct iw_param *p = &wrqu->param;

	struct usbnet *usbdev = dev->priv;

	struct usbnet *usbdev = netdev_priv(dev);

	struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);



	switch (p->flags & IW_AUTH_INDEX) {
@@ -1429,7 +1429,7 @@ static int rndis_iw_get_mode(struct net_device *dev, 
				struct iw_request_info *info,

				union iwreq_data *wrqu, char *extra)

{

	struct usbnet *usbdev = dev->priv;

	struct usbnet *usbdev = netdev_priv(dev);

	struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);



	switch (priv->infra_mode) {
@@ -1452,7 +1452,7 @@ static int rndis_iw_get_mode(struct net_device *dev, 
static int rndis_iw_set_mode(struct net_device *dev,

    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)

{

	struct usbnet *usbdev = dev->priv;

	struct usbnet *usbdev = netdev_priv(dev);

	int mode;



	devdbg(usbdev, "SIOCSIWMODE: %08x", wrqu->mode);
@@ -1477,7 +1477,7 @@ static int rndis_iw_set_mode(struct net_device *dev, 
static int rndis_iw_set_encode(struct net_device *dev,

    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)

{

	struct usbnet *usbdev = dev->priv;

	struct usbnet *usbdev = netdev_priv(dev);

	struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);

	int ret, index, key_len;

	u8 *key;
@@ -1540,7 +1540,7 @@ static int rndis_iw_set_encode_ext(struct net_device *dev, 
    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)

{

	struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;

	struct usbnet *usbdev = dev->priv;

	struct usbnet *usbdev = netdev_priv(dev);

	struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);

	struct ndis_80211_key ndis_key;

	int keyidx, ret;
@@ -1625,7 +1625,7 @@ static int rndis_iw_set_encode_ext(struct net_device *dev, 
static int rndis_iw_set_scan(struct net_device *dev,

    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)

{

	struct usbnet *usbdev = dev->priv;

	struct usbnet *usbdev = netdev_priv(dev);

	union iwreq_data evt;

	int ret = -EINVAL;

	__le32 tmp;
@@ -1650,7 +1650,7 @@ static char *rndis_translate_scan(struct net_device *dev, 
				  struct ndis_80211_bssid_ex *bssid)

{

#ifdef DEBUG

	struct usbnet *usbdev = dev->priv;

	struct usbnet *usbdev = netdev_priv(dev);

#endif

	u8 *ie;

	char *current_val;
@@ -1773,7 +1773,7 @@ static char *rndis_translate_scan(struct net_device *dev, 
static int rndis_iw_get_scan(struct net_device *dev,

    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)

{

	struct usbnet *usbdev = dev->priv;

	struct usbnet *usbdev = netdev_priv(dev);

	void *buf = NULL;

	char *cev = extra;

	struct ndis_80211_bssid_list_ex *bssid_list;
@@ -1819,7 +1819,7 @@ out: 
static int rndis_iw_set_genie(struct net_device *dev,

    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)

{

	struct usbnet *usbdev = dev->priv;

	struct usbnet *usbdev = netdev_priv(dev);

	struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);

	int ret = 0;
@@ -1853,7 +1853,7 @@ static int rndis_iw_set_genie(struct net_device *dev, 
static int rndis_iw_get_genie(struct net_device *dev,

    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)

{

	struct usbnet *usbdev = dev->priv;

	struct usbnet *usbdev = netdev_priv(dev);

	struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);



	devdbg(usbdev, "SIOCGIWGENIE");
@@ -1876,7 +1876,7 @@ static int rndis_iw_get_genie(struct net_device *dev, 
static int rndis_iw_set_rts(struct net_device *dev,

    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)

{

	struct usbnet *usbdev = dev->priv;

	struct usbnet *usbdev = netdev_priv(dev);

	__le32 tmp;

	devdbg(usbdev, "SIOCSIWRTS");
@@ -1889,7 +1889,7 @@ static int rndis_iw_set_rts(struct net_device *dev, 
static int rndis_iw_get_rts(struct net_device *dev,

    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)

{

	struct usbnet *usbdev = dev->priv;

	struct usbnet *usbdev = netdev_priv(dev);

	__le32 tmp;

	int len, ret;
@@ -1910,7 +1910,7 @@ static int rndis_iw_get_rts(struct net_device *dev, 
static int rndis_iw_set_frag(struct net_device *dev,

    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)

{

	struct usbnet *usbdev = dev->priv;

	struct usbnet *usbdev = netdev_priv(dev);

	__le32 tmp;



	devdbg(usbdev, "SIOCSIWFRAG");
@@ -1924,7 +1924,7 @@ static int rndis_iw_set_frag(struct net_device *dev, 
static int rndis_iw_get_frag(struct net_device *dev,

    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)

{

	struct usbnet *usbdev = dev->priv;

	struct usbnet *usbdev = netdev_priv(dev);

	__le32 tmp;

	int len, ret;
@@ -1944,7 +1944,7 @@ static int rndis_iw_get_frag(struct net_device *dev, 
static int rndis_iw_set_nick(struct net_device *dev,

    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)

{

	struct usbnet *usbdev = dev->priv;

	struct usbnet *usbdev = netdev_priv(dev);

	struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);



	devdbg(usbdev, "SIOCSIWNICK");
@@ -1961,7 +1961,7 @@ static int rndis_iw_set_nick(struct net_device *dev, 
static int rndis_iw_get_nick(struct net_device *dev,

    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)

{

	struct usbnet *usbdev = dev->priv;

	struct usbnet *usbdev = netdev_priv(dev);

	struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);



	wrqu->data.flags = 1;
@@ -1977,7 +1977,7 @@ static int rndis_iw_get_nick(struct net_device *dev, 
static int rndis_iw_set_freq(struct net_device *dev,

    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)

{

	struct usbnet *usbdev = dev->priv;

	struct usbnet *usbdev = netdev_priv(dev);

	struct ndis_80211_conf config;

	unsigned int dsconfig;

	int len, ret;
@@ -2008,7 +2008,7 @@ static int rndis_iw_set_freq(struct net_device *dev, 
static int rndis_iw_get_freq(struct net_device *dev,

    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)

{

	struct usbnet *usbdev = dev->priv;

	struct usbnet *usbdev = netdev_priv(dev);

	struct ndis_80211_conf config;

	int len, ret;
@@ -2025,7 +2025,7 @@ static int rndis_iw_get_freq(struct net_device *dev, 
static int rndis_iw_get_txpower(struct net_device *dev,

    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)

{

	struct usbnet *usbdev = dev->priv;

	struct usbnet *usbdev = netdev_priv(dev);

	struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);

	__le32 tx_power;

	int ret = 0, len;
@@ -2059,7 +2059,7 @@ static int rndis_iw_get_txpower(struct net_device *dev, 
static int rndis_iw_set_txpower(struct net_device *dev,

    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)

{

	struct usbnet *usbdev = dev->priv;

	struct usbnet *usbdev = netdev_priv(dev);

	struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);

	__le32 tx_power = 0;

	int ret = 0;
@@ -2111,7 +2111,7 @@ static int rndis_iw_set_txpower(struct net_device *dev, 
static int rndis_iw_get_rate(struct net_device *dev,

    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)

{

	struct usbnet *usbdev = dev->priv;

	struct usbnet *usbdev = netdev_priv(dev);

	__le32 tmp;

	int ret, len;
@@ -2129,7 +2129,7 @@ static int rndis_iw_get_rate(struct net_device *dev, 
static int rndis_iw_set_mlme(struct net_device *dev,

    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)

{

	struct usbnet *usbdev = dev->priv;

	struct usbnet *usbdev = netdev_priv(dev);

	struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);

	struct iw_mlme *mlme = (struct iw_mlme *)extra;

	unsigned char bssid[ETH_ALEN];
@@ -2154,7 +2154,7 @@ static int rndis_iw_set_mlme(struct net_device *dev, 


static struct iw_statistics *rndis_get_wireless_stats(struct net_device *dev)

{

	struct usbnet *usbdev = dev->priv;

	struct usbnet *usbdev = netdev_priv(dev);

	struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);

	unsigned long flags;
@@ -2284,7 +2284,7 @@ get_bssid: 


static void rndis_wext_set_multicast_list(struct net_device *dev)

{

	struct usbnet *usbdev = dev->priv;

	struct usbnet *usbdev = netdev_priv(dev);

	struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);



	if (test_bit(WORK_SET_MULTICAST_LIST, &priv->work_pending))

drivers/net/wireless/wavelan.c

+43 −45

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/znet.c

+11 −11
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static void znet_tx_timeout (struct net_device *dev); 
/* Request needed resources */

static int znet_request_resources (struct net_device *dev)

{

	struct znet_private *znet = dev->priv;

	struct znet_private *znet = netdev_priv(dev);

	unsigned long flags;



	if (request_irq (dev->irq, &znet_interrupt, 0, "ZNet", dev))
@@ -201,7 +201,7 @@ static int znet_request_resources (struct net_device *dev) 


static void znet_release_resources (struct net_device *dev)

{

	struct znet_private *znet = dev->priv;

	struct znet_private *znet = netdev_priv(dev);

	unsigned long flags;



	release_region (znet->sia_base, znet->sia_size);
@@ -216,7 +216,7 @@ static void znet_release_resources (struct net_device *dev) 
/* Keep the magical SIA stuff in a single function... */

static void znet_transceiver_power (struct net_device *dev, int on)

{

	struct znet_private *znet = dev->priv;

	struct znet_private *znet = netdev_priv(dev);

	unsigned char v;



	/* Turn on/off the 82501 SIA, using zenith-specific magic. */
@@ -235,7 +235,7 @@ static void znet_transceiver_power (struct net_device *dev, int on) 
   Also used from hardware_init. */

static void znet_set_multicast_list (struct net_device *dev)

{

	struct znet_private *znet = dev->priv;

	struct znet_private *znet = netdev_priv(dev);

	short ioaddr = dev->base_addr;

	struct i82593_conf_block *cfblk = &znet->i593_init;
@@ -386,7 +386,7 @@ static int __init znet_probe (void) 
	if (!dev)

		return -ENOMEM;



	znet = dev->priv;

	znet = netdev_priv(dev);



	netinfo = (struct netidblk *)p;

	dev->base_addr = netinfo->iobase1;
@@ -530,7 +530,7 @@ static void znet_tx_timeout (struct net_device *dev) 
static int znet_send_packet(struct sk_buff *skb, struct net_device *dev)

{

	int ioaddr = dev->base_addr;

	struct znet_private *znet = dev->priv;

	struct znet_private *znet = netdev_priv(dev);

	unsigned long flags;

	short length = skb->len;
@@ -600,7 +600,7 @@ static int znet_send_packet(struct sk_buff *skb, struct net_device *dev) 
static irqreturn_t znet_interrupt(int irq, void *dev_id)

{

	struct net_device *dev = dev_id;

	struct znet_private *znet = dev->priv;

	struct znet_private *znet = netdev_priv(dev);

	int ioaddr;

	int boguscnt = 20;

	int handled = 0;
@@ -678,7 +678,7 @@ static irqreturn_t znet_interrupt(int irq, void *dev_id) 


static void znet_rx(struct net_device *dev)

{

	struct znet_private *znet = dev->priv;

	struct znet_private *znet = netdev_priv(dev);

	int ioaddr = dev->base_addr;

	int boguscount = 1;

	short next_frame_end_offset = 0; 		/* Offset of next frame start. */
@@ -827,7 +827,7 @@ static void show_dma(struct net_device *dev) 
{

	short ioaddr = dev->base_addr;

	unsigned char stat = inb (ioaddr);

	struct znet_private *znet = dev->priv;

	struct znet_private *znet = netdev_priv(dev);

	unsigned long flags;

	short dma_port = ((znet->tx_dma&3)<<2) + IO_DMA2_BASE;

	unsigned addr = inb(dma_port);
@@ -850,7 +850,7 @@ static void hardware_init(struct net_device *dev) 
{

	unsigned long flags;

	short ioaddr = dev->base_addr;

	struct znet_private *znet = dev->priv;

	struct znet_private *znet = netdev_priv(dev);



	znet->rx_cur = znet->rx_start;

	znet->tx_cur = znet->tx_start;
@@ -912,7 +912,7 @@ static void update_stop_hit(short ioaddr, unsigned short rx_stop_offset) 
static __exit void znet_cleanup (void)

{

	if (znet_dev) {

		struct znet_private *znet = znet_dev->priv;

		struct znet_private *znet = netdev_priv(znet_dev);



		unregister_netdev (znet_dev);

		kfree (znet->rx_start);

net/appletalk/ddp.c

+1 −1
Original line number Diff line number Diff line
@@ -1284,7 +1284,7 @@ static int handle_ip_over_ddp(struct sk_buff *skb) 
	skb->dev   = dev;

	skb_reset_transport_header(skb);



	stats = dev->priv;

	stats = netdev_priv(dev);

	stats->rx_packets++;

	stats->rx_bytes += skb->len + 13;

	netif_rx(skb);  /* Send the SKB up to a higher place. */