diff options
| author | njones <njones> | 2004-03-16 15:23:56 +0000 |
|---|---|---|
| committer | njones <njones> | 2004-03-16 15:23:56 +0000 |
| commit | e385840e6d629eb186d1cc3941db35cb707e7655 (patch) | |
| tree | 6d36230c7b675276b558662a252ae0ba120635d2 | |
| parent | becfe06786a3a973bb459e509cf14b041b053cb2 (diff) | |
Some code cleanups:merged_with_main_trunk_into_0_12_beta9
- removed a stray comment near the top
- Improved the debugging output in the _get/set_encode iw_handlers
| -rw-r--r-- | at76c503.c | 32 |
1 files changed, 16 insertions, 16 deletions
@@ -1,5 +1,5 @@ /* -*- linux-c -*- */ -/* $Id: at76c503.c,v 1.43.2.23 2004/03/16 15:06:35 njones Exp $ +/* $Id: at76c503.c,v 1.43.2.24 2004/03/16 15:23:56 njones Exp $ * * USB at76c503/at76c505 driver * @@ -159,9 +159,6 @@ static inline void usb_set_intfdata(struct usb_interface *intf, void *data) {} /* wireless extension level this source currently supports */ #define WIRELESS_EXT_SUPPORTED 16 -/* wireless handler interface for kernels that support it */ - - #ifndef USB_ST_URB_PENDING #define USB_ST_URB_PENDING (-EINPROGRESS) #define USB_ST_STALL (-EPIPE) @@ -5202,9 +5199,11 @@ int at76c503_iw_handler_set_encode(struct net_device *netdev, "pointer %p len %d", netdev->name, encoding->flags, encoding->pointer, encoding->length); dbg(DBG_IOCTL, "%s: SIOCSIWENCODE - old wepstate: enabled %s key_id %d " - "auth_mode %d", + "auth_mode %s", netdev->name, (dev->wep_enabled) ? "true" : "false", - dev->wep_key_id, dev->auth_mode); + dev->wep_key_id, + (dev->auth_mode == IEEE802_11_AUTH_ALG_SHARED_SECRET) ? + "restricted" : "open"); // take the old default key if index is invalid if ((index < 0) || (index >= NR_WEP_KEYS)) @@ -5230,12 +5229,12 @@ int at76c503_iw_handler_set_encode(struct net_device *netdev, if (encoding->flags & IW_ENCODE_OPEN) dev->auth_mode = IEEE802_11_AUTH_ALG_OPEN_SYSTEM; - dbg(DBG_IOCTL, "%s: SIOCSIWENCODE new wepstate: enabled %s key_id %d " - "key_len %d auth_mode %d", - netdev->name, - (dev->wep_enabled) ? "true" : "false", dev->wep_key_id, - dev->wep_keys_len[dev->wep_key_id], - dev->auth_mode); + dbg(DBG_IOCTL, "%s: SIOCSIWENCODE - new wepstate: enabled %s key_id %d " + "key_len %d auth_mode %s", + netdev->name, (dev->wep_enabled) ? "true" : "false", + dev->wep_key_id + 1, dev->wep_keys_len[dev->wep_key_id], + (dev->auth_mode == IEEE802_11_AUTH_ALG_SHARED_SECRET) ? + "restricted" : "open"); return 0; } @@ -5272,10 +5271,11 @@ int at76c503_iw_handler_get_encode(struct net_device *netdev, "pointer %p len %d", netdev->name, encoding->flags, encoding->pointer, encoding->length); dbg(DBG_IOCTL, "%s: SIOCGIWENCODE - wepstate: enabled %s key_id %d " - "key_len %d auth_mode %d", + "key_len %d auth_mode %s", netdev->name, (dev->wep_enabled) ? "true" : "false", - dev->wep_key_id, dev->wep_keys_len[dev->wep_key_id], - dev->auth_mode); + dev->wep_key_id + 1, dev->wep_keys_len[dev->wep_key_id], + (dev->auth_mode == IEEE802_11_AUTH_ALG_SHARED_SECRET) ? + "restricted" : "open"); return 0; } @@ -6296,7 +6296,7 @@ int init_new_device(struct at76c503 *dev) else dev->rx_data_fcs_len = 4; - info("$Id: at76c503.c,v 1.43.2.23 2004/03/16 15:06:35 njones Exp $ compiled %s %s", __DATE__, __TIME__); + info("$Id: at76c503.c,v 1.43.2.24 2004/03/16 15:23:56 njones Exp $ compiled %s %s", __DATE__, __TIME__); info("firmware version %d.%d.%d #%d (fcs_len %d)", dev->fw_version.major, dev->fw_version.minor, dev->fw_version.patch, dev->fw_version.build, |