From: David Miller <davem@davemloft.net>
To: linux-wireless@vger.kernel.org
Cc: linville@tuxdriver.com, mokuno@sm.sony.co.jp,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/12]: wext: Make adjust_priv_size() take a "struct iw_point *".
Date: Tue, 03 Jun 2008 13:28:10 -0700 (PDT) [thread overview]
Message-ID: <20080603.132810.05908596.davem@davemloft.net> (raw)
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
next reply other threads:[~2008-06-03 20:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-03 20:28 David Miller [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-06-17 7:53 [PATCH 2/12]: wext: Make adjust_priv_size() take a "struct iw_point *" David Miller
2008-06-03 19:19 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080603.132810.05908596.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=mokuno@sm.sony.co.jp \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).