From: David S. Miller <davem@sunset.davemloft.net>
Date: Fri, 21 Dec 2007 11:24:24 +0000 (-0800)
Subject: wext: Make adjust_priv_size() take a "struct iw_point *".
X-Git-Tag: v2.6.27-rc1~969^2~254^2~63^2~10
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=208887d4cc5a5c1eeb68bd170e21e32b1129cd94;p=~emulex%2Finfiniband.git

wext: Make adjust_priv_size() take a "struct iw_point *".

Signed-off-by: David S. Miller <davem@davemloft.net>
---

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,