AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[WEXT]: Remove options.

Browse Source 
This patch kills the two options in wext that are required to be
enabled anyway because they influence the userspace API.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Johannes Berg 2007-04-26 20:45:14 -07:00 committed by David S. Miller
parent 235c107ba0
commit 4b1e255384
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
net/wireless/wext.c
View File

@ -101,12 +101,6 @@
#include <asm/uaccess.h> /* copy_to_user() */ #include <asm/uaccess.h> /* copy_to_user() */
/**************************** CONSTANTS ****************************/
/* Options */
#define WE_EVENT_RTNETLINK /* Propagate events using RtNetlink */
#define WE_SET_EVENT /* Generate an event on some set commands */
/************************* GLOBAL VARIABLES *************************/ /************************* GLOBAL VARIABLES *************************/
/* /*
* You should not use global variables, because of re-entrancy. * You should not use global variables, because of re-entrancy.
@ -741,12 +735,10 @@ static int ioctl_standard_call(struct net_device * dev,
/* No extra arguments. Trivial to handle */ /* No extra arguments. Trivial to handle */
ret = handler(dev, &info, &(iwr->u), NULL); ret = handler(dev, &info, &(iwr->u), NULL);
#ifdef WE_SET_EVENT
/* Generate an event to notify listeners of the change */ /* Generate an event to notify listeners of the change */
if ((descr->flags & IW_DESCR_FLAG_EVENT) && if ((descr->flags & IW_DESCR_FLAG_EVENT) &&
((ret == 0) || (ret == -EIWCOMMIT))) ((ret == 0) || (ret == -EIWCOMMIT)))
wireless_send_event(dev, cmd, &(iwr->u), NULL); wireless_send_event(dev, cmd, &(iwr->u), NULL);
#endif /* WE_SET_EVENT */
} else { } else {
char * extra; char * extra;
int extra_size; int extra_size;
@ -859,7 +851,6 @@ static int ioctl_standard_call(struct net_device * dev,
ret = -EFAULT; ret = -EFAULT;
} }
#ifdef WE_SET_EVENT
/* Generate an event to notify listeners of the change */ /* Generate an event to notify listeners of the change */
if ((descr->flags & IW_DESCR_FLAG_EVENT) && if ((descr->flags & IW_DESCR_FLAG_EVENT) &&
((ret == 0) || (ret == -EIWCOMMIT))) { ((ret == 0) || (ret == -EIWCOMMIT))) {
@ -871,7 +862,6 @@ static int ioctl_standard_call(struct net_device * dev,
wireless_send_event(dev, cmd, &(iwr->u), wireless_send_event(dev, cmd, &(iwr->u),
extra); extra);
} }
#endif /* WE_SET_EVENT */
/* Cleanup - I told you it wasn't that long ;-) */ /* Cleanup - I told you it wasn't that long ;-) */
kfree(extra); kfree(extra);
@ -1121,7 +1111,6 @@ int wext_handle_ioctl(struct ifreq *ifr, unsigned int cmd,
* Most often, the event will be propagated through rtnetlink * Most often, the event will be propagated through rtnetlink
*/ */
#ifdef WE_EVENT_RTNETLINK
/* ---------------------------------------------------------------- */ /* ---------------------------------------------------------------- */
/* /*
* Locking... * Locking...
@ -1225,8 +1214,6 @@ static inline void rtmsg_iwinfo(struct net_device * dev,
tasklet_schedule(&wireless_nlevent_tasklet); tasklet_schedule(&wireless_nlevent_tasklet);
} }
#endif /* WE_EVENT_RTNETLINK */
/* ---------------------------------------------------------------- */ /* ---------------------------------------------------------------- */
/* /*
* Main event dispatcher. Called from other parts and drivers. * Main event dispatcher. Called from other parts and drivers.
@ -1305,10 +1292,8 @@ void wireless_send_event(struct net_device * dev,
if (extra != NULL) if (extra != NULL)
memcpy(((char *) event) + hdr_len, extra, extra_len); memcpy(((char *) event) + hdr_len, extra, extra_len);
#ifdef WE_EVENT_RTNETLINK
/* Send via the RtNetlink event channel */ /* Send via the RtNetlink event channel */
rtmsg_iwinfo(dev, (char *) event, event_len); rtmsg_iwinfo(dev, (char *) event, event_len);
#endif /* WE_EVENT_RTNETLINK */
/* Cleanup */ /* Cleanup */
kfree(event); kfree(event);