* [PATCH 7/12]: wext: Pass iwreq pointer down into standard/private handlers.
@ 2008-06-03 19:20 David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2008-06-03 19:20 UTC (permalink / raw)
To: linux-wireless; +Cc: linville, mokuno, netdev, linux-kernel
They have no need to see the object as an ifreq.
Signed-off-by: David S. Miller <davem@davemloft.net>
---
net/wireless/wext.c | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/net/wireless/wext.c b/net/wireless/wext.c
index 929d241..b72cdd2 100644
--- a/net/wireless/wext.c
+++ b/net/wireless/wext.c
@@ -832,11 +832,10 @@ out:
* user space and kernel space.
*/
static int ioctl_standard_call(struct net_device * dev,
- struct ifreq * ifr,
+ struct iwreq * iwr,
unsigned int cmd,
iw_handler handler)
{
- struct iwreq * iwr = (struct iwreq *) ifr;
const struct iw_ioctl_description * descr;
struct iw_request_info info;
int ret = -EINVAL;
@@ -984,10 +983,9 @@ out:
return err;
}
-static int ioctl_private_call(struct net_device *dev, struct ifreq *ifr,
+static int ioctl_private_call(struct net_device *dev, struct iwreq *iwr,
unsigned int cmd, iw_handler handler)
{
- struct iwreq *iwr = (struct iwreq *) ifr;
int extra_size = 0, ret = -EINVAL;
const struct iw_priv_args *descr;
struct iw_request_info info;
@@ -1015,7 +1013,7 @@ static int ioctl_private_call(struct net_device *dev, struct ifreq *ifr,
}
/* ---------------------------------------------------------------- */
-typedef int (*wext_ioctl_func)(struct net_device *, struct ifreq *,
+typedef int (*wext_ioctl_func)(struct net_device *, struct iwreq *,
unsigned int, iw_handler);
/*
@@ -1027,6 +1025,7 @@ static int wireless_process_ioctl(struct net *net, struct ifreq *ifr,
wext_ioctl_func standard,
wext_ioctl_func private)
{
+ struct iwreq *iwr = (struct iwreq *) ifr;
struct net_device *dev;
iw_handler handler;
@@ -1041,11 +1040,11 @@ static int wireless_process_ioctl(struct net *net, struct ifreq *ifr,
* Note that 'cmd' is already filtered in dev_ioctl() with
* (cmd >= SIOCIWFIRST && cmd <= SIOCIWLAST) */
if (cmd == SIOCGIWSTATS)
- return standard(dev, ifr, cmd,
+ return standard(dev, iwr, cmd,
&iw_handler_get_iwstats);
if (cmd == SIOCGIWPRIV && dev->wireless_handlers)
- return standard(dev, ifr, cmd,
+ return standard(dev, iwr, cmd,
&iw_handler_get_private);
/* Basic check */
@@ -1057,9 +1056,9 @@ static int wireless_process_ioctl(struct net *net, struct ifreq *ifr,
if (handler) {
/* Standard and private are not the same */
if (cmd < SIOCIWFIRSTPRIV)
- return standard(dev, ifr, cmd, handler);
+ return standard(dev, iwr, cmd, handler);
else
- return private(dev, ifr, cmd, handler);
+ return private(dev, iwr, cmd, handler);
}
/* Old driver API : call driver ioctl handler */
if (dev->do_ioctl)
--
1.5.5.1.308.g1fbb5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 7/12]: wext: Pass iwreq pointer down into standard/private handlers.
@ 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
They have no need to see the object as an ifreq.
Signed-off-by: David S. Miller <davem@davemloft.net>
---
net/wireless/wext.c | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/net/wireless/wext.c b/net/wireless/wext.c
index 929d241..b72cdd2 100644
--- a/net/wireless/wext.c
+++ b/net/wireless/wext.c
@@ -832,11 +832,10 @@ out:
* user space and kernel space.
*/
static int ioctl_standard_call(struct net_device * dev,
- struct ifreq * ifr,
+ struct iwreq * iwr,
unsigned int cmd,
iw_handler handler)
{
- struct iwreq * iwr = (struct iwreq *) ifr;
const struct iw_ioctl_description * descr;
struct iw_request_info info;
int ret = -EINVAL;
@@ -984,10 +983,9 @@ out:
return err;
}
-static int ioctl_private_call(struct net_device *dev, struct ifreq *ifr,
+static int ioctl_private_call(struct net_device *dev, struct iwreq *iwr,
unsigned int cmd, iw_handler handler)
{
- struct iwreq *iwr = (struct iwreq *) ifr;
int extra_size = 0, ret = -EINVAL;
const struct iw_priv_args *descr;
struct iw_request_info info;
@@ -1015,7 +1013,7 @@ static int ioctl_private_call(struct net_device *dev, struct ifreq *ifr,
}
/* ---------------------------------------------------------------- */
-typedef int (*wext_ioctl_func)(struct net_device *, struct ifreq *,
+typedef int (*wext_ioctl_func)(struct net_device *, struct iwreq *,
unsigned int, iw_handler);
/*
@@ -1027,6 +1025,7 @@ static int wireless_process_ioctl(struct net *net, struct ifreq *ifr,
wext_ioctl_func standard,
wext_ioctl_func private)
{
+ struct iwreq *iwr = (struct iwreq *) ifr;
struct net_device *dev;
iw_handler handler;
@@ -1041,11 +1040,11 @@ static int wireless_process_ioctl(struct net *net, struct ifreq *ifr,
* Note that 'cmd' is already filtered in dev_ioctl() with
* (cmd >= SIOCIWFIRST && cmd <= SIOCIWLAST) */
if (cmd == SIOCGIWSTATS)
- return standard(dev, ifr, cmd,
+ return standard(dev, iwr, cmd,
&iw_handler_get_iwstats);
if (cmd == SIOCGIWPRIV && dev->wireless_handlers)
- return standard(dev, ifr, cmd,
+ return standard(dev, iwr, cmd,
&iw_handler_get_private);
/* Basic check */
@@ -1057,9 +1056,9 @@ static int wireless_process_ioctl(struct net *net, struct ifreq *ifr,
if (handler) {
/* Standard and private are not the same */
if (cmd < SIOCIWFIRSTPRIV)
- return standard(dev, ifr, cmd, handler);
+ return standard(dev, iwr, cmd, handler);
else
- return private(dev, ifr, cmd, handler);
+ return private(dev, iwr, cmd, handler);
}
/* Old driver API : call driver ioctl handler */
if (dev->do_ioctl)
--
1.5.5.1.308.g1fbb5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 7/12]: wext: Pass iwreq pointer down into standard/private handlers.
@ 2008-06-17 7:54 David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2008-06-17 7:54 UTC (permalink / raw)
To: linville; +Cc: mokuno, linux-wireless, netdev, linux-kernel
wext: Pass iwreq pointer down into standard/private handlers.
They have no need to see the object as an ifreq.
Signed-off-by: David S. Miller <davem@davemloft.net>
---
net/wireless/wext.c | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/net/wireless/wext.c b/net/wireless/wext.c
index 929d241..e9c8817 100644
--- a/net/wireless/wext.c
+++ b/net/wireless/wext.c
@@ -832,11 +832,10 @@ out:
* user space and kernel space.
*/
static int ioctl_standard_call(struct net_device * dev,
- struct ifreq * ifr,
+ struct iwreq *iwr,
unsigned int cmd,
iw_handler handler)
{
- struct iwreq * iwr = (struct iwreq *) ifr;
const struct iw_ioctl_description * descr;
struct iw_request_info info;
int ret = -EINVAL;
@@ -984,10 +983,9 @@ out:
return err;
}
-static int ioctl_private_call(struct net_device *dev, struct ifreq *ifr,
+static int ioctl_private_call(struct net_device *dev, struct iwreq *iwr,
unsigned int cmd, iw_handler handler)
{
- struct iwreq *iwr = (struct iwreq *) ifr;
int extra_size = 0, ret = -EINVAL;
const struct iw_priv_args *descr;
struct iw_request_info info;
@@ -1015,7 +1013,7 @@ static int ioctl_private_call(struct net_device *dev, struct ifreq *ifr,
}
/* ---------------------------------------------------------------- */
-typedef int (*wext_ioctl_func)(struct net_device *, struct ifreq *,
+typedef int (*wext_ioctl_func)(struct net_device *, struct iwreq *,
unsigned int, iw_handler);
/*
@@ -1027,6 +1025,7 @@ static int wireless_process_ioctl(struct net *net, struct ifreq *ifr,
wext_ioctl_func standard,
wext_ioctl_func private)
{
+ struct iwreq *iwr = (struct iwreq *) ifr;
struct net_device *dev;
iw_handler handler;
@@ -1041,11 +1040,11 @@ static int wireless_process_ioctl(struct net *net, struct ifreq *ifr,
* Note that 'cmd' is already filtered in dev_ioctl() with
* (cmd >= SIOCIWFIRST && cmd <= SIOCIWLAST) */
if (cmd == SIOCGIWSTATS)
- return standard(dev, ifr, cmd,
+ return standard(dev, iwr, cmd,
&iw_handler_get_iwstats);
if (cmd == SIOCGIWPRIV && dev->wireless_handlers)
- return standard(dev, ifr, cmd,
+ return standard(dev, iwr, cmd,
&iw_handler_get_private);
/* Basic check */
@@ -1057,9 +1056,9 @@ static int wireless_process_ioctl(struct net *net, struct ifreq *ifr,
if (handler) {
/* Standard and private are not the same */
if (cmd < SIOCIWFIRSTPRIV)
- return standard(dev, ifr, cmd, handler);
+ return standard(dev, iwr, cmd, handler);
else
- return private(dev, ifr, cmd, handler);
+ return private(dev, iwr, cmd, handler);
}
/* Old driver API : call driver ioctl handler */
if (dev->do_ioctl)
--
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:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-03 19:20 [PATCH 7/12]: wext: Pass iwreq pointer down into standard/private handlers David Miller
-- strict thread matches above, loose matches on Subject: below --
2008-06-03 20:28 David Miller
2008-06-17 7:54 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).