|
@@ -159,15 +159,12 @@ static int hermes_set_tkip_keys(ltv_t *ltv, u16 key_idx, u8 *addr,
|
|
|
/* Set up the LTV to clear the appropriate key */
|
|
|
static int hermes_clear_tkip_keys(ltv_t *ltv, u16 key_idx, u8 *addr)
|
|
|
{
|
|
|
- int ret;
|
|
|
-
|
|
|
switch (key_idx) {
|
|
|
case 0:
|
|
|
if (!is_broadcast_ether_addr(addr)) {
|
|
|
ltv->len = 7;
|
|
|
ltv->typ = CFG_REMOVE_TKIP_MAPPED_KEY;
|
|
|
memcpy(<v->u.u8[0], addr, ETH_ALEN);
|
|
|
- ret = 0;
|
|
|
}
|
|
|
break;
|
|
|
case 1:
|
|
@@ -178,13 +175,12 @@ static int hermes_clear_tkip_keys(ltv_t *ltv, u16 key_idx, u8 *addr)
|
|
|
ltv->typ = CFG_REMOVE_TKIP_DEFAULT_KEY;
|
|
|
ltv->u.u16[0] = cpu_to_le16(key_idx);
|
|
|
|
|
|
- ret = 0;
|
|
|
break;
|
|
|
default:
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- return ret;
|
|
|
+ return 0;
|
|
|
}
|
|
|
|
|
|
/* Set the WEP keys in the wl_private structure */
|
|
@@ -3027,13 +3023,10 @@ static int wireless_set_genie(struct net_device *dev,
|
|
|
struct iw_point *data, char *extra)
|
|
|
|
|
|
{
|
|
|
- int ret = 0;
|
|
|
-
|
|
|
/* We can't write this to the card, but apparently this
|
|
|
* operation needs to succeed */
|
|
|
- ret = 0;
|
|
|
|
|
|
- return ret;
|
|
|
+ return 0;
|
|
|
}
|
|
|
/*============================================================================*/
|
|
|
|