aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2007-12-21 03:24:24 -0800
committerDavid S. Miller <davem@davemloft.net>2008-06-16 18:29:55 -0700
commit208887d4cc5a5c1eeb68bd170e21e32b1129cd94 (patch)
treed1f9a0c3215470ae7402ff0129066eeffa58390e /net
parent25519a2a769d42fc2733a8f119682272d99b1304 (diff)
wext: Make adjust_priv_size() take a "struct iw_point *".
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/wireless/wext.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/wireless/wext.c b/net/wireless/wext.c
index e83d74affd7..cd2cf9fec10 100644
--- a/net/wireless/wext.c
+++ b/net/wireless/wext.c
@@ -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,