[MAC80211]: remove set_key_idx callback

[linux-2.6] / net / rfkill / rfkill.c

diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c
index a973603e388028925b73c1c5b893f3a279bf6c29..03ed7fd8afe0e8cf4923920f40d234cd3e6149e9 100644 (file)
--- a/net/rfkill/rfkill.c
+++ b/net/rfkill/rfkill.c
@@ -106,8 +106,8 @@ static ssize_t rfkill_type_show(struct device *dev,
        case RFKILL_TYPE_BLUETOOTH:
                type = "bluetooth";
                break;
-       case RFKILL_TYPE_IRDA:
-               type = "irda";
+       case RFKILL_TYPE_UWB:
+               type = "ultrawideband";
                break;
        default:
                BUG();
@@ -187,7 +187,7 @@ static ssize_t rfkill_claim_store(struct device *dev,
 static struct device_attribute rfkill_dev_attrs[] = {
        __ATTR(name, S_IRUGO, rfkill_name_show, NULL),
        __ATTR(type, S_IRUGO, rfkill_type_show, NULL),
-       __ATTR(state, S_IRUGO, rfkill_state_show, rfkill_state_store),
+       __ATTR(state, S_IRUGO|S_IWUSR, rfkill_state_show, rfkill_state_store),
        __ATTR(claim, S_IRUGO|S_IWUSR, rfkill_claim_show, rfkill_claim_store),
        __ATTR_NULL
 };
@@ -281,7 +281,7 @@ static void rfkill_remove_switch(struct rfkill *rfkill)
 /**
  * rfkill_allocate - allocate memory for rfkill structure.
  * @parent: device that has rf switch on it
- * @type: type of the switch (wlan, bluetooth, irda)
+ * @type: type of the switch (RFKILL_TYPE_*)
  *
  * This function should be called by the network driver when it needs
  * rfkill structure. Once the structure is allocated the driver shoud
@@ -296,7 +296,7 @@ struct rfkill *rfkill_allocate(struct device *parent, enum rfkill_type type)
        struct device *dev;
 
        rfkill = kzalloc(sizeof(struct rfkill), GFP_KERNEL);
-       if (rfkill)
+       if (!rfkill)
                return NULL;
 
        mutex_init(&rfkill->mutex);