diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-08-23 17:49:42 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-08-23 17:49:42 +0400 |
| commit | a4881cc45a3fab4488e16c4934e149cfa620f1a9 (patch) | |
| tree | 653eaec2c015a52ba17b4e1b714251b9472925ec /net | |
| parent | 6de3f7e911d27d6737c79b3f6b5069044ea408ec (diff) | |
| parent | aba4e6fff8de0c92e53f0e7ef077231e75f7d760 (diff) | |
| download | linux-a4881cc45a3fab4488e16c4934e149cfa620f1a9.tar.xz | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/cfg.c | 2 | ||||
| -rw-r--r-- | net/rfkill/core.c | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 69b322f6ca2e..929f897a8ded 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -740,7 +740,7 @@ static int ieee80211_set_probe_resp(struct ieee80211_sub_if_data *sdata, struct probe_resp *new, *old; if (!resp || !resp_len) - return -EINVAL; + return 1; old = rtnl_dereference(sdata->u.ap.probe_resp); diff --git a/net/rfkill/core.c b/net/rfkill/core.c index 752b72360ebc..c275bad12068 100644 --- a/net/rfkill/core.c +++ b/net/rfkill/core.c @@ -150,6 +150,20 @@ static void rfkill_led_trigger_activate(struct led_classdev *led) rfkill_led_trigger_event(rfkill); } +const char *rfkill_get_led_trigger_name(struct rfkill *rfkill) +{ + return rfkill->led_trigger.name; +} +EXPORT_SYMBOL(rfkill_get_led_trigger_name); + +void rfkill_set_led_trigger_name(struct rfkill *rfkill, const char *name) +{ + BUG_ON(!rfkill); + + rfkill->ledtrigname = name; +} +EXPORT_SYMBOL(rfkill_set_led_trigger_name); + static int rfkill_led_trigger_register(struct rfkill *rfkill) { rfkill->led_trigger.name = rfkill->ledtrigname |