From b9dfb12cb28c6f450e04361b374862397faff3e5 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Fri, 21 Dec 2007 03:24:24 -0800 Subject: [PATCH] --- yaml --- r: 103125 b: refs/heads/master c: 208887d4cc5a5c1eeb68bd170e21e32b1129cd94 h: refs/heads/master i: 103123: d4703a17432f25b1905ab6e02984df49320b33aa v: v3 --- [refs] | 2 +- trunk/net/wireless/wext.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index fce943b1a5ea..b05485ec8478 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 25519a2a769d42fc2733a8f119682272d99b1304 +refs/heads/master: 208887d4cc5a5c1eeb68bd170e21e32b1129cd94 diff --git a/trunk/net/wireless/wext.c b/trunk/net/wireless/wext.c index e83d74affd72..cd2cf9fec10f 100644 --- a/trunk/net/wireless/wext.c +++ b/trunk/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,