* [PATCH 2/12]: wext: Make adjust_priv_size() take a "struct iw_point *".
@ 2008-06-03 19:19 David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2008-06-03 19:19 UTC (permalink / raw)
To: linux-wireless; +Cc: linville, mokuno, netdev, linux-kernel
Signed-off-by: David S. Miller <davem@davemloft.net>
---
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 e83d74a..cd2cf9f 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,
--
1.5.5.1.308.g1fbb5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/12]: wext: Make adjust_priv_size() take a "struct iw_point *".
@ 2008-06-03 20:28 David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2008-06-03 20:28 UTC (permalink / raw)
To: linux-wireless; +Cc: linville, mokuno, netdev, linux-kernel
Signed-off-by: David S. Miller <davem@davemloft.net>
---
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 e83d74a..cd2cf9f 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,
--
1.5.5.1.308.g1fbb5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/12]: wext: Make adjust_priv_size() take a "struct iw_point *".
@ 2008-06-17 7:53 David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2008-06-17 7:53 UTC (permalink / raw)
To: linville; +Cc: mokuno, linux-wireless, netdev, linux-kernel
wext: Make adjust_priv_size() take a "struct iw_point *".
Signed-off-by: David S. Miller <davem@davemloft.net>
---
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 e83d74a..cd2cf9f 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,
--
1.5.5.1.308.g1fbb5
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-06-17 7:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-03 20:28 [PATCH 2/12]: wext: Make adjust_priv_size() take a "struct iw_point *" David Miller
-- strict thread matches above, loose matches on Subject: below --
2008-06-17 7:53 David Miller
2008-06-03 19:19 David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).