aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/Kconfig13
-rw-r--r--drivers/net/ps3_gelic_wireless.c6
2 files changed, 19 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 9f6cc8a56073..e52533d75ae1 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2283,6 +2283,19 @@ config GELIC_WIRELESS
2283 the driver automatically distinguishes the models, you can 2283 the driver automatically distinguishes the models, you can
2284 safely enable this option even if you have a wireless-less model. 2284 safely enable this option even if you have a wireless-less model.
2285 2285
2286config GELIC_WIRELESS_OLD_PSK_INTERFACE
2287 bool "PS3 Wireless private PSK interface (OBSOLETE)"
2288 depends on GELIC_WIRELESS
2289 help
2290 This option retains the obsolete private interface to pass
2291 the PSK from user space programs to the driver. The PSK
2292 stands for 'Pre Shared Key' and is used for WPA[2]-PSK
2293 (WPA-Personal) environment.
2294 If WPA[2]-PSK is used and you need to use old programs that
2295 support only this old interface, say Y. Otherwise N.
2296
2297 If unsure, say N.
2298
2286config GIANFAR 2299config GIANFAR
2287 tristate "Gianfar Ethernet" 2300 tristate "Gianfar Ethernet"
2288 depends on FSL_SOC 2301 depends on FSL_SOC
diff --git a/drivers/net/ps3_gelic_wireless.c b/drivers/net/ps3_gelic_wireless.c
index 5f698099e9b7..f5e5f13eaf43 100644
--- a/drivers/net/ps3_gelic_wireless.c
+++ b/drivers/net/ps3_gelic_wireless.c
@@ -1375,6 +1375,7 @@ static int gelic_wl_get_mode(struct net_device *netdev,
1375 return 0; 1375 return 0;
1376} 1376}
1377 1377
1378#ifdef CONFIG_GELIC_WIRELESS_OLD_PSK_INTERFACE
1378/* SIOCIWFIRSTPRIV */ 1379/* SIOCIWFIRSTPRIV */
1379static int hex2bin(u8 *str, u8 *bin, unsigned int len) 1380static int hex2bin(u8 *str, u8 *bin, unsigned int len)
1380{ 1381{
@@ -1479,6 +1480,7 @@ static int gelic_wl_priv_get_psk(struct net_device *net_dev,
1479 pr_debug("%s:-> %d\n", __func__, data->data.length); 1480 pr_debug("%s:-> %d\n", __func__, data->data.length);
1480 return 0; 1481 return 0;
1481} 1482}
1483#endif
1482 1484
1483/* SIOCGIWNICKN */ 1485/* SIOCGIWNICKN */
1484static int gelic_wl_get_nick(struct net_device *net_dev, 1486static int gelic_wl_get_nick(struct net_device *net_dev,
@@ -2355,6 +2357,7 @@ static const iw_handler gelic_wl_wext_handler[] =
2355 IW_IOCTL(SIOCGIWNICKN) = gelic_wl_get_nick, 2357 IW_IOCTL(SIOCGIWNICKN) = gelic_wl_get_nick,
2356}; 2358};
2357 2359
2360#ifdef CONFIG_GELIC_WIRELESS_OLD_PSK_INTERFACE
2358static struct iw_priv_args gelic_wl_private_args[] = 2361static struct iw_priv_args gelic_wl_private_args[] =
2359{ 2362{
2360 { 2363 {
@@ -2376,15 +2379,18 @@ static const iw_handler gelic_wl_private_handler[] =
2376 gelic_wl_priv_set_psk, 2379 gelic_wl_priv_set_psk,
2377 gelic_wl_priv_get_psk, 2380 gelic_wl_priv_get_psk,
2378}; 2381};
2382#endif
2379 2383
2380static const struct iw_handler_def gelic_wl_wext_handler_def = { 2384static const struct iw_handler_def gelic_wl_wext_handler_def = {
2381 .num_standard = ARRAY_SIZE(gelic_wl_wext_handler), 2385 .num_standard = ARRAY_SIZE(gelic_wl_wext_handler),
2382 .standard = gelic_wl_wext_handler, 2386 .standard = gelic_wl_wext_handler,
2383 .get_wireless_stats = gelic_wl_get_wireless_stats, 2387 .get_wireless_stats = gelic_wl_get_wireless_stats,
2388#ifdef CONFIG_GELIC_WIRELESS_OLD_PSK_INTERFACE
2384 .num_private = ARRAY_SIZE(gelic_wl_private_handler), 2389 .num_private = ARRAY_SIZE(gelic_wl_private_handler),
2385 .num_private_args = ARRAY_SIZE(gelic_wl_private_args), 2390 .num_private_args = ARRAY_SIZE(gelic_wl_private_args),
2386 .private = gelic_wl_private_handler, 2391 .private = gelic_wl_private_handler,
2387 .private_args = gelic_wl_private_args, 2392 .private_args = gelic_wl_private_args,
2393#endif
2388}; 2394};
2389 2395
2390static struct net_device *gelic_wl_alloc(struct gelic_card *card) 2396static struct net_device *gelic_wl_alloc(struct gelic_card *card)