[PATCH] dev->priv to netdev_priv(dev), for drivers/net/wireless

Replacing accesses to dev->priv to netdev_priv(dev). The replacment
is safe when netdev_priv is used to access a private structure that is
right next to the net_device structure in memory. Cf
http://groups.google.com/group/comp.os.linux.development.system/browse_thread/thread/de19321bcd94dbb8/0d74a4adcd6177bd
This is the case when the net_device structure was allocated with
a call to alloc_netdev or one of its derivative.

Signed-off-by: Yoann Padioleau <padator@wanadoo.fr>
Cc: mcgrof@gmail.com
Cc: linux-wireless@vger.kernel.org
Cc: akpm@linux-foundation.org
Signed-off-by: John W. Linville <linville@tuxdriver.com>

3 files changed, 9 insertions, 9 deletions

diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index 30e723f65979..f9cf22bda42e 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -272,7 +272,7 @@ static int sandisk_enable_wireless(struct net_device *dev)
 {
         int res, ret = 0;
         conf_reg_t reg;
-        struct hostap_interface *iface = dev->priv;
+        struct hostap_interface *iface = netdev_priv(dev);
         local_info_t *local = iface->local;
         tuple_t tuple;
         cisparse_t *parse = NULL;
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c
index d3dacbceabb3..adedb9716542 100644
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
@@ -3424,7 +3424,7 @@ static void prism2_suspend(struct net_device *dev)
         struct local_info *local;
         union iwreq_data wrqu;
 
-        iface = dev->priv;
+        iface = netdev_priv(dev);
         local = iface->local;
 
         /* Send disconnect event, e.g., to trigger reassociation after resume
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c
index 8c71077d653c..d58ac84f4e9e 100644
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -3088,7 +3088,7 @@ static int prism2_ioctl_priv_download(local_info_t *local, struct iw_point *p)
 static int prism2_set_genericelement(struct net_device *dev, u8 *elem,
                                      size_t len)
 {
-        struct hostap_interface *iface = dev->priv;
+        struct hostap_interface *iface = netdev_priv(dev);
         local_info_t *local = iface->local;
         u8 *buf;
 
@@ -3116,7 +3116,7 @@ static int prism2_ioctl_siwauth(struct net_device *dev,
                                 struct iw_request_info *info,
                                 struct iw_param *data, char *extra)
 {
-        struct hostap_interface *iface = dev->priv;
+        struct hostap_interface *iface = netdev_priv(dev);
         local_info_t *local = iface->local;
 
         switch (data->flags & IW_AUTH_INDEX) {
@@ -3182,7 +3182,7 @@ static int prism2_ioctl_giwauth(struct net_device *dev,
                                 struct iw_request_info *info,
                                 struct iw_param *data, char *extra)
 {
-        struct hostap_interface *iface = dev->priv;
+        struct hostap_interface *iface = netdev_priv(dev);
         local_info_t *local = iface->local;
 
         switch (data->flags & IW_AUTH_INDEX) {
@@ -3221,7 +3221,7 @@ static int prism2_ioctl_siwencodeext(struct net_device *dev,
                                      struct iw_request_info *info,
                                      struct iw_point *erq, char *extra)
 {
-        struct hostap_interface *iface = dev->priv;
+        struct hostap_interface *iface = netdev_priv(dev);
         local_info_t *local = iface->local;
         struct iw_encode_ext *ext = (struct iw_encode_ext *) extra;
         int i, ret = 0;
@@ -3395,7 +3395,7 @@ static int prism2_ioctl_giwencodeext(struct net_device *dev,
                                      struct iw_request_info *info,
                                      struct iw_point *erq, char *extra)
 {
-        struct hostap_interface *iface = dev->priv;
+        struct hostap_interface *iface = netdev_priv(dev);
         local_info_t *local = iface->local;
         struct ieee80211_crypt_data **crypt;
         void *sta_ptr;
@@ -3716,7 +3716,7 @@ static int prism2_ioctl_giwgenie(struct net_device *dev,
                                  struct iw_request_info *info,
                                  struct iw_point *data, char *extra)
 {
-        struct hostap_interface *iface = dev->priv;
+        struct hostap_interface *iface = netdev_priv(dev);
         local_info_t *local = iface->local;
         int len = local->generic_elem_len - 2;
 
@@ -3755,7 +3755,7 @@ static int prism2_ioctl_siwmlme(struct net_device *dev,
                                 struct iw_request_info *info,
                                 struct iw_point *data, char *extra)
 {
-        struct hostap_interface *iface = dev->priv;
+        struct hostap_interface *iface = netdev_priv(dev);
         local_info_t *local = iface->local;
         struct iw_mlme *mlme = (struct iw_mlme *) extra;
         u16 reason;