rndis_wlan: convert get/set frag/rts to cfg80211
Subsystems (5)
PATCH 1/3 rndis_wlan: convert get/set frag/rts to cfg80211
---
drivers/net/wireless/rndis_wlan.c | 135 +++++++++++++++++-------------------- 1 files changed, 63 insertions(+), 72 deletions(-)
drivers/net/wireless/rndis_wlan.c +63 -72
@@ -427,9 +427,12 @@ static int rndis_change_virtual_intf(struct wiphy *wiphy, int ifindex,static int rndis_scan (struct wiphy *wiphy,struct net_device *dev,struct cfg80211_scan_request *request); +static int rndis_set_wiphy_params (struct wiphy *wiphy,u32 changed); +static struct cfg80211_ops rndis_config_ops = { .change_virtual_intf = rndis_change_virtual_intf, .scan = rndis_scan, + .set_wiphy_params = rndis_set_wiphy_params, };static void *rndis_wiphy_privid = &rndis_wiphy_privid;
@@ -968,6 +971,36 @@ static int set_infra_mode(struct usbnet *usbdev, int mode) } +static int set_rts_threshold (struct usbnet *usbdev,u32 rts_threshold) +{ +__le32 tmp; + +devdbg (usbdev,"set_rts_threshold %i" , rts_threshold); + +if (rts_threshold <0 || rts_threshold >2347 ) + rts_threshold =2347 ; + + tmp =cpu_to_le32 (rts_threshold); +return rndis_set_oid (usbdev,OID_802_11_RTS_THRESHOLD , &tmp, +sizeof (tmp)); +} + + +static int set_frag_threshold (struct usbnet *usbdev,u32 frag_threshold) +{ +__le32 tmp; + +devdbg (usbdev,"set_frag_threshold %i" , frag_threshold); + +if (frag_threshold <256 || frag_threshold >2346 ) + frag_threshold =2346 ; + + tmp =cpu_to_le32 (frag_threshold); +return rndis_set_oid (usbdev,OID_802_11_FRAGMENTATION_THRESHOLD , &tmp, +sizeof (tmp)); +} + +static void set_default_iw_params (struct usbnet *usbdev) {struct rndis_wlan_private *priv =get_rndis_wlan_priv (usbdev);
@@ -1251,6 +1284,28 @@ static int rndis_change_virtual_intf(struct wiphy *wiphy, int ifindex, } +static int rndis_set_wiphy_params (struct wiphy *wiphy,u32 changed) +{ +struct rndis_wlan_private *priv =wiphy_priv (wiphy); +struct usbnet *usbdev = priv->usbdev; +int err; + +if (changed &WIPHY_PARAM_FRAG_THRESHOLD ) { + err =set_frag_threshold (usbdev, wiphy->frag_threshold); +if (err <0 ) +return err; + } + +if (changed &WIPHY_PARAM_RTS_THRESHOLD ) { + err =set_rts_threshold (usbdev, wiphy->rts_threshold); +if (err <0 ) +return err; + } + +return 0 ; +} + +#define SCAN_DELAY_JIFFIES (HZ)static int rndis_scan (struct wiphy *wiphy,struct net_device *dev,struct cfg80211_scan_request *request)
@@ -1766,74 +1821,6 @@ static int rndis_iw_get_genie(struct net_device *dev, } -static int rndis_iw_set_rts (struct net_device *dev, -struct iw_request_info *info,union iwreq_data *wrqu,char *extra) -{ -struct usbnet *usbdev =netdev_priv (dev); -__le32 tmp; -devdbg (usbdev,"SIOCSIWRTS" ); - - tmp =cpu_to_le32 (wrqu->rts.value); -return rndis_set_oid (usbdev,OID_802_11_RTS_THRESHOLD , &tmp, -sizeof (tmp)); -} - - -static int rndis_iw_get_rts (struct net_device *dev, -struct iw_request_info *info,union iwreq_data *wrqu,char *extra) -{ -struct usbnet *usbdev =netdev_priv (dev); -__le32 tmp; -int len, ret; - - len =sizeof (tmp); - ret =rndis_query_oid (usbdev,OID_802_11_RTS_THRESHOLD , &tmp, &len); -if (ret ==0 ) { - wrqu->rts.value =le32_to_cpu (tmp); - wrqu->rts.flags =1 ; - wrqu->rts.disabled =0 ; - } - -devdbg (usbdev,"SIOCGIWRTS: %d" , wrqu->rts.value); - -return ret; -} - - -static int rndis_iw_set_frag (struct net_device *dev, -struct iw_request_info *info,union iwreq_data *wrqu,char *extra) -{ -struct usbnet *usbdev =netdev_priv (dev); -__le32 tmp; - -devdbg (usbdev,"SIOCSIWFRAG" ); - - tmp =cpu_to_le32 (wrqu->frag.value); -return rndis_set_oid (usbdev,OID_802_11_FRAGMENTATION_THRESHOLD , &tmp, -sizeof (tmp)); -} - - -static int rndis_iw_get_frag (struct net_device *dev, -struct iw_request_info *info,union iwreq_data *wrqu,char *extra) -{ -struct usbnet *usbdev =netdev_priv (dev); -__le32 tmp; -int len, ret; - - len =sizeof (tmp); - ret =rndis_query_oid (usbdev,OID_802_11_FRAGMENTATION_THRESHOLD , &tmp, - &len); -if (ret ==0 ) { - wrqu->frag.value =le32_to_cpu (tmp); - wrqu->frag.flags =1 ; - wrqu->frag.disabled =0 ; - } -devdbg (usbdev,"SIOCGIWFRAG: %d" , wrqu->frag.value); -return ret; -} - -static int rndis_iw_set_freq (struct net_device *dev,struct iw_request_info *info,union iwreq_data *wrqu,char *extra) {
@@ -2022,10 +2009,10 @@ static const iw_handler rndis_iw_handler[] =IW_IOCTL (SIOCSIWESSID ) = rndis_iw_set_essid,IW_IOCTL (SIOCGIWESSID ) = rndis_iw_get_essid,IW_IOCTL (SIOCGIWRATE ) = rndis_iw_get_rate, -IW_IOCTL (SIOCSIWRTS ) = rndis_iw_set_rts, -IW_IOCTL (SIOCGIWRTS ) = rndis_iw_get_rts, -IW_IOCTL (SIOCSIWFRAG ) = rndis_iw_set_frag, -IW_IOCTL (SIOCGIWFRAG ) = rndis_iw_get_frag, +IW_IOCTL (SIOCSIWRTS ) = (iw_handler ) cfg80211_wext_siwrts, +IW_IOCTL (SIOCGIWRTS ) = (iw_handler ) cfg80211_wext_giwrts, +IW_IOCTL (SIOCSIWFRAG ) = (iw_handler ) cfg80211_wext_siwfrag, +IW_IOCTL (SIOCGIWFRAG ) = (iw_handler ) cfg80211_wext_giwfrag,IW_IOCTL (SIOCSIWTXPOW ) = rndis_iw_set_txpower,IW_IOCTL (SIOCGIWTXPOW ) = rndis_iw_get_txpower, IW_IOCTL(SIOCSIWENCODE) = rndis_iw_set_encode,
@@ -2475,6 +2462,10 @@ static int rndis_wlan_bind(struct usbnet *usbdev, struct usb_interface *intf)set_default_iw_params (usbdev); +/* set default rts/frag */ +rndis_set_wiphy_params (wiphy, +WIPHY_PARAM_FRAG_THRESHOLD |WIPHY_PARAM_RTS_THRESHOLD ); +/* turn radio on */ priv->radio_on =1 ;disassociate (usbdev,1 );
PATCH 2/3 usbnet: Add stop function pointer to 'struct rndis_data'.
Allow minidriver to know that netdev has stopped. This is to let wireless turn off radio when usbnet dev is stopped.
---
drivers/net/usb/usbnet.c | 14 ++++++++++++++ include/linux/usb/usbnet.h | 3 +++ 2 files changed, 17 insertions(+), 0 deletions(-)
drivers/net/usb/usbnet.c +14 -0
@@ -544,7 +544,9 @@ EXPORT_SYMBOL_GPL(usbnet_unlink_rx_urbs);int usbnet_stop (struct net_device *net) {struct usbnet *dev =netdev_priv (net); +struct driver_info *info = dev->driver_info;int temp; +int retval;DECLARE_WAIT_QUEUE_HEAD_ONSTACK (unlink_wakeup);DECLARE_WAITQUEUE (wait, current);
@@ -556,6 +558,18 @@ int usbnet_stop (struct net_device *net) dev->stats.rx_errors, dev->stats.tx_errors ); +/* allow minidriver to stop correctly (wireless devices to turn off +* radio etc) */ +if (info->stop) { + retval = info->stop (dev); +if (retval <0 &&netif_msg_ifdown (dev)) +devinfo (dev, +"stop fail (%d) usbnet usb-%s-%s, %s" , + retval, + dev->udev->bus->bus_name, dev->udev->devpath, + info->description); + } +// ensure there are no more active urbs add_wait_queue (&unlink_wakeup, &wait); dev->wait = &unlink_wakeup;
include/linux/usb/usbnet.h +3 -0
@@ -98,6 +98,9 @@ struct driver_info {/* reset device ... can sleep */ int (*reset)(struct usbnet *); +/* stop device ... can sleep */ +int (*stop)(struct usbnet *); +/* see if peer is connected ... can sleep */ int (*check_connect)(struct usbnet *);
Re: [PATCH 2/3] usbnet: Add stop function pointer to 'struct rndis_data'.
Quoted 5 lines · Jussi Kivilinna
Allow minidriver to know that netdev has stopped. This is to let wireless turn off radio when usbnet dev is stopped.
Signed-off-by Jussi Kivilinna <[email protected]>CC David Brownell <[email protected]>
Quoted 55 lines
---
drivers/net/usb/usbnet.c | 14 ++++++++++++++ include/linux/usb/usbnet.h | 3 +++ 2 files changed, 17 insertions(+), 0 deletions(-)drivers/net/usb/usbnet.c +14
-0@@ -544,7 +544,9 @@ EXPORT_SYMBOL_GPL(usbnet_unlink_rx_urbs);int usbnet_stop (struct net_device *net) {struct usbnet *dev =netdev_priv (net); +struct driver_info *info = dev->driver_info;int temp; +int retval;DECLARE_WAIT_QUEUE_HEAD_ONSTACK (unlink_wakeup);DECLARE_WAITQUEUE (wait, current);@@ -556,6 +558,18 @@ int usbnet_stop (struct net_device *net) dev->stats.rx_errors, dev->stats.tx_errors ); +/* allow minidriver to stop correctly (wireless devices to turn off +* radio etc) */ +if (info->stop) { + retval = info->stop (dev); +if (retval <0 &&netif_msg_ifdown (dev)) +devinfo (dev, +"stop fail (%d) usbnet usb-%s-%s, %s" , + retval, + dev->udev->bus->bus_name, dev->udev->devpath, + info->description); + } +// ensure there are no more active urbs add_wait_queue (&unlink_wakeup, &wait); dev->wait = &unlink_wakeup;include/linux/usb/usbnet.h +3
-0@@ -98,6 +98,9 @@ struct driver_info {/* reset device ... can sleep */ int (*reset)(struct usbnet *); +/* stop device ... can sleep */ +int (*stop)(struct usbnet *); +/* see if peer is connected ... can sleep */ int (*check_connect)(struct usbnet *);
Re: [PATCH 2/3] usbnet: Add stop function pointer to 'struct rndis_data'.
From: David Brownell <[email protected]>
Date: Thu, 18 Jun 2009 22:17:37 -0700
Quoted 8 lines · Jussi Kivilinna
Quoted 5 lines
Allow minidriver to know that netdev has stopped. This is to let wireless turn off radio when usbnet dev is stopped.
Signed-off-by Jussi Kivilinna <[email protected]>CC David Brownell <[email protected]>Acked-by David Brownell <[email protected]>
John please take this into your wireless tree if you haven't already.
Thanks!
PATCH 3/3 rndis_wlan: convert set/get txpower to cfg80211
In reply to Jussi KivilinnaConvert set/get txpower to cfg80211 and add stop netdev handler to turn off radio for rfkill.
---
drivers/net/wireless/rndis_wlan.c | 148 +++++++++++++++++++------------------ 1 files changed, 75 insertions(+), 73 deletions(-)
drivers/net/wireless/rndis_wlan.c +75 -73
@@ -139,9 +139,15 @@ MODULE_PARM_DESC(workaround_interval,/* Assume that Broadcom 4320 (only chipset at time of writing known to be * based on wireless rndis) has default txpower of 13dBm. * This value is from Linksys WUSB54GSC User Guide, Appendix F: Specifications. -* 13dBm == 19.9mW +* 100% : 20 mW ~ 13dBm +* 75% : 15 mW ~ 12dBm +* 50% : 10 mW ~ 10dBm +* 25% : 5 mW ~ 7dBm */ -#define BCM4320_DEFAULT_TXPOWER 20 +#define BCM4320_DEFAULT_TXPOWER_DBM_100 13 +#define BCM4320_DEFAULT_TXPOWER_DBM_75 12 +#define BCM4320_DEFAULT_TXPOWER_DBM_50 10 +#define BCM4320_DEFAULT_TXPOWER_DBM_25 7/* codes for "status" field of completion messages */
@@ -429,15 +435,20 @@ static int rndis_scan(struct wiphy *wiphy, struct net_device *dev,static int rndis_set_wiphy_params (struct wiphy *wiphy,u32 changed); +static int rndis_set_tx_power (struct wiphy *wiphy,enum tx_power_setting type, +int dbm); +static int rndis_get_tx_power (struct wiphy *wiphy,int *dbm); +static struct cfg80211_ops rndis_config_ops = { .change_virtual_intf = rndis_change_virtual_intf, .scan = rndis_scan, .set_wiphy_params = rndis_set_wiphy_params, + .set_tx_power = rndis_set_tx_power, + .get_tx_power = rndis_get_tx_power, };static void *rndis_wiphy_privid = &rndis_wiphy_privid; -static const int bcm4320_power_output[4 ] = {25 ,50 ,75 ,100 };static const unsigned char zero_bssid[ETH_ALEN ] = {0 ,};static const unsigned char ffff_bssid[ETH_ALEN ] = {0xff ,0xff ,0xff ,
@@ -450,10 +461,19 @@ static struct rndis_wlan_private *get_rndis_wlan_priv(struct usbnet *dev) } -static u32 get_bcm4320_power (struct rndis_wlan_private *priv) +static u32 get_bcm4320_power_dbm (struct rndis_wlan_private *priv) { -return BCM4320_DEFAULT_TXPOWER * - bcm4320_power_output[priv->param_power_output] /100 ; +switch (priv->param_power_output) { +default : +case 3 : +return BCM4320_DEFAULT_TXPOWER_DBM_100 ; +case 2 : +return BCM4320_DEFAULT_TXPOWER_DBM_75 ; +case 1 : +return BCM4320_DEFAULT_TXPOWER_DBM_50 ; +case 0 : +return BCM4320_DEFAULT_TXPOWER_DBM_25 ; + } }
@@ -1306,6 +1326,42 @@ static int rndis_set_wiphy_params(struct wiphy *wiphy, u32 changed) } +static int rndis_set_tx_power (struct wiphy *wiphy,enum tx_power_setting type, +int dbm) +{ +struct rndis_wlan_private *priv =wiphy_priv (wiphy); +struct usbnet *usbdev = priv->usbdev; + +devdbg (usbdev,"rndis_set_tx_power type:0x%x dbm:%i" , type, dbm); + +/* Device doesn't support changing txpower after initialization, only +* turn off/on radio. Support 'auto' mode and setting same dBm that is +* currently used. +*/ +if (type ==TX_POWER_AUTOMATIC || dbm ==get_bcm4320_power_dbm (priv)) { +if (!priv->radio_on) +disassociate (usbdev,1 );/* turn on radio */ + +return 0 ; + } + +return -ENOTSUPP ; +} + + +static int rndis_get_tx_power (struct wiphy *wiphy,int *dbm) +{ +struct rndis_wlan_private *priv =wiphy_priv (wiphy); +struct usbnet *usbdev = priv->usbdev; + + *dbm =get_bcm4320_power_dbm (priv); + +devdbg (usbdev,"rndis_get_tx_power dbm:%i" , *dbm); + +return 0 ; +} + +#define SCAN_DELAY_JIFFIES (HZ)static int rndis_scan (struct wiphy *wiphy,struct net_device *dev,struct cfg80211_scan_request *request)
@@ -1869,71 +1925,6 @@ static int rndis_iw_get_freq(struct net_device *dev, } -static int rndis_iw_get_txpower (struct net_device *dev, -struct iw_request_info *info,union iwreq_data *wrqu,char *extra) -{ -struct usbnet *usbdev =netdev_priv (dev); -struct rndis_wlan_private *priv =get_rndis_wlan_priv (usbdev); -__le32 tx_power; - -if (priv->radio_on) { -/* fake since changing tx_power (by userlevel) not supported */ - tx_power =cpu_to_le32 (get_bcm4320_power (priv)); - - wrqu->txpower.flags =IW_TXPOW_MWATT ; - wrqu->txpower.value =le32_to_cpu (tx_power); - wrqu->txpower.disabled =0 ; - }else { - wrqu->txpower.flags =IW_TXPOW_MWATT ; - wrqu->txpower.value =0 ; - wrqu->txpower.disabled =1 ; - } - -devdbg (usbdev,"SIOCGIWTXPOW: %d" , wrqu->txpower.value); - -return 0 ; -} - - -static int rndis_iw_set_txpower (struct net_device *dev, -struct iw_request_info *info,union iwreq_data *wrqu,char *extra) -{ -struct usbnet *usbdev =netdev_priv (dev); -struct rndis_wlan_private *priv =get_rndis_wlan_priv (usbdev); -__le32 tx_power =0 ; - -if (!wrqu->txpower.disabled) { -if (wrqu->txpower.flags ==IW_TXPOW_MWATT ) - tx_power =cpu_to_le32 (wrqu->txpower.value); -else {/* wrqu->txpower.flags == IW_TXPOW_DBM */ -if (wrqu->txpower.value >20 ) - tx_power =cpu_to_le32 (128 ); -else if (wrqu->txpower.value <-43 ) - tx_power =cpu_to_le32 (127 ); -else { -signed char tmp; - tmp = wrqu->txpower.value; - tmp =-12 - tmp; - tmp <<=2 ; - tx_power =cpu_to_le32 ((unsigned char )tmp); - } - } - } - -devdbg (usbdev,"SIOCSIWTXPOW: %d" ,le32_to_cpu (tx_power)); - -if (le32_to_cpu (tx_power) !=0 ) { -/* txpower unsupported, just turn radio on */ -if (!priv->radio_on) -return disassociate (usbdev,1 ); -return 0 ;/* all ready on */ - } - -/* tx_power == 0, turn off radio */ -return disassociate (usbdev,0 ); -} - -static int rndis_iw_get_rate (struct net_device *dev,struct iw_request_info *info,union iwreq_data *wrqu,char *extra) {
@@ -2013,8 +2004,8 @@ static const iw_handler rndis_iw_handler[] =IW_IOCTL (SIOCGIWRTS ) = (iw_handler ) cfg80211_wext_giwrts,IW_IOCTL (SIOCSIWFRAG ) = (iw_handler ) cfg80211_wext_siwfrag,IW_IOCTL (SIOCGIWFRAG ) = (iw_handler ) cfg80211_wext_giwfrag, -IW_IOCTL (SIOCSIWTXPOW ) = rndis_iw_set_txpower, -IW_IOCTL (SIOCGIWTXPOW ) = rndis_iw_get_txpower, +IW_IOCTL (SIOCSIWTXPOW ) = (iw_handler ) cfg80211_wext_siwtxpower, +IW_IOCTL (SIOCGIWTXPOW ) = (iw_handler ) cfg80211_wext_giwtxpower,IW_IOCTL (SIOCSIWENCODE ) = rndis_iw_set_encode,IW_IOCTL (SIOCSIWENCODEEXT ) = rndis_iw_set_encode_ext, IW_IOCTL(SIOCSIWAUTH) = rndis_iw_set_auth,
@@ -2513,10 +2504,18 @@ static void rndis_wlan_unbind(struct usbnet *usbdev, struct usb_interface *intf)static int rndis_wlan_reset (struct usbnet *usbdev) { +devdbg (usbdev,"rndis_wlan_reset" );return deauthenticate (usbdev); } +static int rndis_wlan_stop (struct usbnet *usbdev) +{ +devdbg (usbdev,"rndis_wlan_stop" ); +return disassociate (usbdev,0 ); +} + +static const struct driver_info bcm4320b_info = { .description ="Wireless RNDIS device, BCM4320b based" , .flags =FLAG_WLAN |FLAG_FRAMING_RN |FLAG_NO_SETINT ,
@@ -2526,6 +2525,7 @@ static const struct driver_info bcm4320b_info = { .rx_fixup = rndis_rx_fixup, .tx_fixup = rndis_tx_fixup, .reset = rndis_wlan_reset, + .stop = rndis_wlan_stop, .early_init = bcm4320b_early_init, .link_change = rndis_wlan_link_change, };
@@ -2539,6 +2539,7 @@ static const struct driver_info bcm4320a_info = { .rx_fixup = rndis_rx_fixup, .tx_fixup = rndis_tx_fixup, .reset = rndis_wlan_reset, + .stop = rndis_wlan_stop, .early_init = bcm4320a_early_init, .link_change = rndis_wlan_link_change, };
@@ -2552,6 +2553,7 @@ static const struct driver_info rndis_wlan_info = { .rx_fixup = rndis_rx_fixup, .tx_fixup = rndis_tx_fixup, .reset = rndis_wlan_reset, + .stop = rndis_wlan_stop, .early_init = bcm4320a_early_init, .link_change = rndis_wlan_link_change, };