diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-04 16:25:15 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-04 16:25:15 -0500 |
| commit | 8f56874bd7e8bee73ed6a1cf80dcec2753616262 (patch) | |
| tree | aebd15dea662ef5efd89402b8fd92fec540a98eb /net/wireless/wext-core.c | |
| parent | 47e1c323069bcef0acb8a2b48921688573f5ca63 (diff) | |
| parent | 159bcfeb9123c91f0dc885a42b6387a98192f896 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/wireless/wext-core.c')
| -rw-r--r-- | net/wireless/wext-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c index 58dfb954974a..5e1656bdf23b 100644 --- a/net/wireless/wext-core.c +++ b/net/wireless/wext-core.c | |||
| @@ -802,7 +802,8 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd, | |||
| 802 | } | 802 | } |
| 803 | 803 | ||
| 804 | /* Generate an event to notify listeners of the change */ | 804 | /* Generate an event to notify listeners of the change */ |
| 805 | if ((descr->flags & IW_DESCR_FLAG_EVENT) && err == -EIWCOMMIT) { | 805 | if ((descr->flags & IW_DESCR_FLAG_EVENT) && |
| 806 | ((err == 0) || (err == -EIWCOMMIT))) { | ||
| 806 | union iwreq_data *data = (union iwreq_data *) iwp; | 807 | union iwreq_data *data = (union iwreq_data *) iwp; |
| 807 | 808 | ||
| 808 | if (descr->flags & IW_DESCR_FLAG_RESTRICT) | 809 | if (descr->flags & IW_DESCR_FLAG_RESTRICT) |