Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f409e348 authored by Masakazu Mokuno's avatar Masakazu Mokuno Committed by John W. Linville
Browse files

PS3: gelic: Deprecate the private ioctls in the gelic driver 



As the driver has the standard way to handle PSK, deprecate the old
interface.

Signed-off-by: default avatarMasakazu Mokuno <mokuno@sm.sony.co.jp>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 04b2046c

drivers/net/Kconfig

+13 −0
Original line number Original line Diff line number Diff line
@@ -2283,6 +2283,19 @@ config GELIC_WIRELESS 
	  the driver automatically distinguishes the models, you can

	  the driver automatically distinguishes the models, you can

	  safely enable this option even if you have a wireless-less model.

	  safely enable this option even if you have a wireless-less model.





config GELIC_WIRELESS_OLD_PSK_INTERFACE

       bool "PS3 Wireless private PSK interface (OBSOLETE)"

       depends on GELIC_WIRELESS

       help

          This option retains the obsolete private interface to pass

          the PSK from user space programs to the driver.  The PSK

          stands for 'Pre Shared Key' and is used for WPA[2]-PSK

          (WPA-Personal) environment.

          If WPA[2]-PSK is used and you need to use old programs that

          support only this old interface, say Y.  Otherwise N.



          If unsure, say N.



config GIANFAR

config GIANFAR

	tristate "Gianfar Ethernet"

	tristate "Gianfar Ethernet"

	depends on FSL_SOC

	depends on FSL_SOC

drivers/net/ps3_gelic_wireless.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -1375,6 +1375,7 @@ static int gelic_wl_get_mode(struct net_device *netdev, 
	return 0;

	return 0;

}

}





#ifdef CONFIG_GELIC_WIRELESS_OLD_PSK_INTERFACE

/* SIOCIWFIRSTPRIV */

/* SIOCIWFIRSTPRIV */

static int hex2bin(u8 *str, u8 *bin, unsigned int len)

static int hex2bin(u8 *str, u8 *bin, unsigned int len)

{

{
@@ -1479,6 +1480,7 @@ static int gelic_wl_priv_get_psk(struct net_device *net_dev, 
	pr_debug("%s:-> %d\n", __func__, data->data.length);

	pr_debug("%s:-> %d\n", __func__, data->data.length);

	return 0;

	return 0;

}

}

#endif





/* SIOCGIWNICKN */

/* SIOCGIWNICKN */

static int gelic_wl_get_nick(struct net_device *net_dev,

static int gelic_wl_get_nick(struct net_device *net_dev,
@@ -2355,6 +2357,7 @@ static const iw_handler gelic_wl_wext_handler[] = 
	IW_IOCTL(SIOCGIWNICKN)		= gelic_wl_get_nick,

	IW_IOCTL(SIOCGIWNICKN)		= gelic_wl_get_nick,

};

};





#ifdef CONFIG_GELIC_WIRELESS_OLD_PSK_INTERFACE

static struct iw_priv_args gelic_wl_private_args[] =

static struct iw_priv_args gelic_wl_private_args[] =

{

{

	{

	{
@@ -2376,15 +2379,18 @@ static const iw_handler gelic_wl_private_handler[] = 
	gelic_wl_priv_set_psk,

	gelic_wl_priv_set_psk,

	gelic_wl_priv_get_psk,

	gelic_wl_priv_get_psk,

};

};

#endif





static const struct iw_handler_def gelic_wl_wext_handler_def = {

static const struct iw_handler_def gelic_wl_wext_handler_def = {

	.num_standard		= ARRAY_SIZE(gelic_wl_wext_handler),

	.num_standard		= ARRAY_SIZE(gelic_wl_wext_handler),

	.standard		= gelic_wl_wext_handler,

	.standard		= gelic_wl_wext_handler,

	.get_wireless_stats	= gelic_wl_get_wireless_stats,

	.get_wireless_stats	= gelic_wl_get_wireless_stats,

#ifdef CONFIG_GELIC_WIRELESS_OLD_PSK_INTERFACE

	.num_private		= ARRAY_SIZE(gelic_wl_private_handler),

	.num_private		= ARRAY_SIZE(gelic_wl_private_handler),

	.num_private_args	= ARRAY_SIZE(gelic_wl_private_args),

	.num_private_args	= ARRAY_SIZE(gelic_wl_private_args),

	.private		= gelic_wl_private_handler,

	.private		= gelic_wl_private_handler,

	.private_args		= gelic_wl_private_args,

	.private_args		= gelic_wl_private_args,

#endif

};

};





static struct net_device *gelic_wl_alloc(struct gelic_card *card)

static struct net_device *gelic_wl_alloc(struct gelic_card *card)