diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/wireless/wext.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/wireless/wext.c b/net/wireless/wext.c index e83d74affd72..cd2cf9fec10f 100644 --- a/net/wireless/wext.c +++ b/net/wireless/wext.c | |||
@@ -512,9 +512,9 @@ static int get_priv_size(__u16 args) | |||
512 | /* | 512 | /* |
513 | * Re-calculate the size of private arguments | 513 | * Re-calculate the size of private arguments |
514 | */ | 514 | */ |
515 | static int adjust_priv_size(__u16 args, union iwreq_data *wrqu) | 515 | static int adjust_priv_size(__u16 args, struct iw_point *iwp) |
516 | { | 516 | { |
517 | int num = wrqu->data.length; | 517 | int num = iwp->length; |
518 | int max = args & IW_PRIV_SIZE_MASK; | 518 | int max = args & IW_PRIV_SIZE_MASK; |
519 | int type = (args & IW_PRIV_TYPE_MASK) >> 12; | 519 | int type = (args & IW_PRIV_TYPE_MASK) >> 12; |
520 | 520 | ||
@@ -976,7 +976,7 @@ static int ioctl_private_call(struct net_device *dev, struct ifreq *ifr, | |||
976 | * avoid leaking kernel bits outside. */ | 976 | * avoid leaking kernel bits outside. */ |
977 | if (!(descr->get_args & IW_PRIV_SIZE_FIXED)) { | 977 | if (!(descr->get_args & IW_PRIV_SIZE_FIXED)) { |
978 | extra_size = adjust_priv_size(descr->get_args, | 978 | extra_size = adjust_priv_size(descr->get_args, |
979 | &(iwr->u)); | 979 | &(iwr->u.data)); |
980 | } | 980 | } |
981 | 981 | ||
982 | err = copy_to_user(iwr->u.data.pointer, extra, | 982 | err = copy_to_user(iwr->u.data.pointer, extra, |