diff options
Diffstat (limited to 'net/core/wireless.c')
-rw-r--r-- | net/core/wireless.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/net/core/wireless.c b/net/core/wireless.c index f69ab7b4408e..64017d47b25b 100644 --- a/net/core/wireless.c +++ b/net/core/wireless.c | |||
@@ -369,7 +369,7 @@ static const struct iw_ioctl_description standard_event[] = { | |||
369 | .header_type = IW_HEADER_TYPE_ADDR, | 369 | .header_type = IW_HEADER_TYPE_ADDR, |
370 | }, | 370 | }, |
371 | [IWEVEXPIRED - IWEVFIRST] = { | 371 | [IWEVEXPIRED - IWEVFIRST] = { |
372 | .header_type = IW_HEADER_TYPE_ADDR, | 372 | .header_type = IW_HEADER_TYPE_ADDR, |
373 | }, | 373 | }, |
374 | [IWEVGENIE - IWEVFIRST] = { | 374 | [IWEVGENIE - IWEVFIRST] = { |
375 | .header_type = IW_HEADER_TYPE_POINT, | 375 | .header_type = IW_HEADER_TYPE_POINT, |
@@ -377,7 +377,7 @@ static const struct iw_ioctl_description standard_event[] = { | |||
377 | .max_tokens = IW_GENERIC_IE_MAX, | 377 | .max_tokens = IW_GENERIC_IE_MAX, |
378 | }, | 378 | }, |
379 | [IWEVMICHAELMICFAILURE - IWEVFIRST] = { | 379 | [IWEVMICHAELMICFAILURE - IWEVFIRST] = { |
380 | .header_type = IW_HEADER_TYPE_POINT, | 380 | .header_type = IW_HEADER_TYPE_POINT, |
381 | .token_size = 1, | 381 | .token_size = 1, |
382 | .max_tokens = sizeof(struct iw_michaelmicfailure), | 382 | .max_tokens = sizeof(struct iw_michaelmicfailure), |
383 | }, | 383 | }, |
@@ -630,11 +630,11 @@ static __inline__ void wireless_seq_printf_stats(struct seq_file *seq, | |||
630 | dev->name, stats->status, stats->qual.qual, | 630 | dev->name, stats->status, stats->qual.qual, |
631 | stats->qual.updated & IW_QUAL_QUAL_UPDATED | 631 | stats->qual.updated & IW_QUAL_QUAL_UPDATED |
632 | ? '.' : ' ', | 632 | ? '.' : ' ', |
633 | ((__s32) stats->qual.level) - | 633 | ((__s32) stats->qual.level) - |
634 | ((stats->qual.updated & IW_QUAL_DBM) ? 0x100 : 0), | 634 | ((stats->qual.updated & IW_QUAL_DBM) ? 0x100 : 0), |
635 | stats->qual.updated & IW_QUAL_LEVEL_UPDATED | 635 | stats->qual.updated & IW_QUAL_LEVEL_UPDATED |
636 | ? '.' : ' ', | 636 | ? '.' : ' ', |
637 | ((__s32) stats->qual.noise) - | 637 | ((__s32) stats->qual.noise) - |
638 | ((stats->qual.updated & IW_QUAL_DBM) ? 0x100 : 0), | 638 | ((stats->qual.updated & IW_QUAL_DBM) ? 0x100 : 0), |
639 | stats->qual.updated & IW_QUAL_NOISE_UPDATED | 639 | stats->qual.updated & IW_QUAL_NOISE_UPDATED |
640 | ? '.' : ' ', | 640 | ? '.' : ' ', |
@@ -862,7 +862,7 @@ static int ioctl_standard_call(struct net_device * dev, | |||
862 | iwr->u.data.length * | 862 | iwr->u.data.length * |
863 | descr->token_size); | 863 | descr->token_size); |
864 | if (err) | 864 | if (err) |
865 | ret = -EFAULT; | 865 | ret = -EFAULT; |
866 | #ifdef WE_IOCTL_DEBUG | 866 | #ifdef WE_IOCTL_DEBUG |
867 | printk(KERN_DEBUG "%s (WE) : Wrote %d bytes\n", | 867 | printk(KERN_DEBUG "%s (WE) : Wrote %d bytes\n", |
868 | dev->name, | 868 | dev->name, |
@@ -1040,7 +1040,7 @@ static inline int ioctl_private_call(struct net_device * dev, | |||
1040 | err = copy_to_user(iwr->u.data.pointer, extra, | 1040 | err = copy_to_user(iwr->u.data.pointer, extra, |
1041 | extra_size); | 1041 | extra_size); |
1042 | if (err) | 1042 | if (err) |
1043 | ret = -EFAULT; | 1043 | ret = -EFAULT; |
1044 | #ifdef WE_IOCTL_DEBUG | 1044 | #ifdef WE_IOCTL_DEBUG |
1045 | printk(KERN_DEBUG "%s (WE) : Wrote %d elem\n", | 1045 | printk(KERN_DEBUG "%s (WE) : Wrote %d elem\n", |
1046 | dev->name, iwr->u.data.length); | 1046 | dev->name, iwr->u.data.length); |
@@ -1080,7 +1080,7 @@ int wireless_process_ioctl(struct ifreq *ifr, unsigned int cmd) | |||
1080 | /* A bunch of special cases, then the generic case... | 1080 | /* A bunch of special cases, then the generic case... |
1081 | * Note that 'cmd' is already filtered in dev_ioctl() with | 1081 | * Note that 'cmd' is already filtered in dev_ioctl() with |
1082 | * (cmd >= SIOCIWFIRST && cmd <= SIOCIWLAST) */ | 1082 | * (cmd >= SIOCIWFIRST && cmd <= SIOCIWLAST) */ |
1083 | switch(cmd) | 1083 | switch(cmd) |
1084 | { | 1084 | { |
1085 | case SIOCGIWSTATS: | 1085 | case SIOCGIWSTATS: |
1086 | /* Get Wireless Stats */ | 1086 | /* Get Wireless Stats */ |
@@ -2015,7 +2015,7 @@ void wireless_send_event(struct net_device * dev, | |||
2015 | * The best the driver could do is to log an error message. | 2015 | * The best the driver could do is to log an error message. |
2016 | * We will do it ourselves instead... | 2016 | * We will do it ourselves instead... |
2017 | */ | 2017 | */ |
2018 | printk(KERN_ERR "%s (WE) : Invalid/Unknown Wireless Event (0x%04X)\n", | 2018 | printk(KERN_ERR "%s (WE) : Invalid/Unknown Wireless Event (0x%04X)\n", |
2019 | dev->name, cmd); | 2019 | dev->name, cmd); |
2020 | return; | 2020 | return; |
2021 | } | 2021 | } |
@@ -2029,11 +2029,11 @@ void wireless_send_event(struct net_device * dev, | |||
2029 | if(descr->header_type == IW_HEADER_TYPE_POINT) { | 2029 | if(descr->header_type == IW_HEADER_TYPE_POINT) { |
2030 | /* Check if number of token fits within bounds */ | 2030 | /* Check if number of token fits within bounds */ |
2031 | if(wrqu->data.length > descr->max_tokens) { | 2031 | if(wrqu->data.length > descr->max_tokens) { |
2032 | printk(KERN_ERR "%s (WE) : Wireless Event too big (%d)\n", dev->name, wrqu->data.length); | 2032 | printk(KERN_ERR "%s (WE) : Wireless Event too big (%d)\n", dev->name, wrqu->data.length); |
2033 | return; | 2033 | return; |
2034 | } | 2034 | } |
2035 | if(wrqu->data.length < descr->min_tokens) { | 2035 | if(wrqu->data.length < descr->min_tokens) { |
2036 | printk(KERN_ERR "%s (WE) : Wireless Event too small (%d)\n", dev->name, wrqu->data.length); | 2036 | printk(KERN_ERR "%s (WE) : Wireless Event too small (%d)\n", dev->name, wrqu->data.length); |
2037 | return; | 2037 | return; |
2038 | } | 2038 | } |
2039 | /* Calculate extra_len - extra is NULL for restricted events */ | 2039 | /* Calculate extra_len - extra is NULL for restricted events */ |