]> err.no Git - linux-2.6/commitdiff
wext: Make adjust_priv_size() take a "struct iw_point *".
authorDavid S. Miller <davem@sunset.davemloft.net>
Fri, 21 Dec 2007 11:24:24 +0000 (03:24 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 17 Jun 2008 01:29:55 +0000 (18:29 -0700)
Signed-off-by: David S. Miller <davem@davemloft.net>
net/wireless/wext.c

index e83d74affd72c3744947f80631f518df7b71c315..cd2cf9fec10f32c281e812a874de1b8f9a0f9649 100644 (file)
@@ -512,9 +512,9 @@ static int get_priv_size(__u16 args)
 /*
  * Re-calculate the size of private arguments
  */
-static int adjust_priv_size(__u16 args, union iwreq_data *wrqu)
+static int adjust_priv_size(__u16 args, struct iw_point *iwp)
 {
-       int     num = wrqu->data.length;
+       int     num = iwp->length;
        int     max = args & IW_PRIV_SIZE_MASK;
        int     type = (args & IW_PRIV_TYPE_MASK) >> 12;
 
@@ -976,7 +976,7 @@ static int ioctl_private_call(struct net_device *dev, struct ifreq *ifr,
                         * avoid leaking kernel bits outside. */
                        if (!(descr->get_args & IW_PRIV_SIZE_FIXED)) {
                                extra_size = adjust_priv_size(descr->get_args,
-                                                             &(iwr->u));
+                                                             &(iwr->u.data));
                        }
 
                        err = copy_to_user(iwr->u.data.pointer, extra,