diff options
Diffstat (limited to 'drivers/net/ethernet/toshiba/ps3_gelic_wireless.c')
| -rw-r--r-- | drivers/net/ethernet/toshiba/ps3_gelic_wireless.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c b/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c index d568af1eb4f4..0a7f2e77557f 100644 --- a/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c +++ b/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c | |||
| @@ -723,13 +723,10 @@ static int gelic_wl_get_scan(struct net_device *netdev, | |||
| 723 | /* If a scan in progress, caller should call me again */ | 723 | /* If a scan in progress, caller should call me again */ |
| 724 | ret = -EAGAIN; | 724 | ret = -EAGAIN; |
| 725 | goto out; | 725 | goto out; |
| 726 | break; | ||
| 727 | |||
| 728 | case GELIC_WL_SCAN_STAT_INIT: | 726 | case GELIC_WL_SCAN_STAT_INIT: |
| 729 | /* last scan request failed or never issued */ | 727 | /* last scan request failed or never issued */ |
| 730 | ret = -ENODEV; | 728 | ret = -ENODEV; |
| 731 | goto out; | 729 | goto out; |
| 732 | break; | ||
| 733 | case GELIC_WL_SCAN_STAT_GOT_LIST: | 730 | case GELIC_WL_SCAN_STAT_GOT_LIST: |
| 734 | /* ok, use current list */ | 731 | /* ok, use current list */ |
| 735 | break; | 732 | break; |
| @@ -1831,25 +1828,18 @@ static const char *wpasecstr(enum gelic_eurus_wpa_security sec) | |||
| 1831 | switch (sec) { | 1828 | switch (sec) { |
| 1832 | case GELIC_EURUS_WPA_SEC_NONE: | 1829 | case GELIC_EURUS_WPA_SEC_NONE: |
| 1833 | return "NONE"; | 1830 | return "NONE"; |
| 1834 | break; | ||
| 1835 | case GELIC_EURUS_WPA_SEC_WPA_TKIP_TKIP: | 1831 | case GELIC_EURUS_WPA_SEC_WPA_TKIP_TKIP: |
| 1836 | return "WPA_TKIP_TKIP"; | 1832 | return "WPA_TKIP_TKIP"; |
| 1837 | break; | ||
| 1838 | case GELIC_EURUS_WPA_SEC_WPA_TKIP_AES: | 1833 | case GELIC_EURUS_WPA_SEC_WPA_TKIP_AES: |
| 1839 | return "WPA_TKIP_AES"; | 1834 | return "WPA_TKIP_AES"; |
| 1840 | break; | ||
| 1841 | case GELIC_EURUS_WPA_SEC_WPA_AES_AES: | 1835 | case GELIC_EURUS_WPA_SEC_WPA_AES_AES: |
| 1842 | return "WPA_AES_AES"; | 1836 | return "WPA_AES_AES"; |
| 1843 | break; | ||
| 1844 | case GELIC_EURUS_WPA_SEC_WPA2_TKIP_TKIP: | 1837 | case GELIC_EURUS_WPA_SEC_WPA2_TKIP_TKIP: |
| 1845 | return "WPA2_TKIP_TKIP"; | 1838 | return "WPA2_TKIP_TKIP"; |
| 1846 | break; | ||
| 1847 | case GELIC_EURUS_WPA_SEC_WPA2_TKIP_AES: | 1839 | case GELIC_EURUS_WPA_SEC_WPA2_TKIP_AES: |
| 1848 | return "WPA2_TKIP_AES"; | 1840 | return "WPA2_TKIP_AES"; |
| 1849 | break; | ||
| 1850 | case GELIC_EURUS_WPA_SEC_WPA2_AES_AES: | 1841 | case GELIC_EURUS_WPA_SEC_WPA2_AES_AES: |
| 1851 | return "WPA2_AES_AES"; | 1842 | return "WPA2_AES_AES"; |
| 1852 | break; | ||
| 1853 | } | 1843 | } |
| 1854 | return ""; | 1844 | return ""; |
| 1855 | }; | 1845 | }; |
