Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/net/wireless/p54/txrx.c b/drivers/net/wireless/p54/txrx.c
index 704685fab177..6fc0b6148c8a 100644
--- a/drivers/net/wireless/p54/txrx.c
+++ b/drivers/net/wireless/p54/txrx.c
@@ -552,6 +552,12 @@ static void p54_rx_trap(struct p54_common *priv, struct sk_buff *skb)
                 break;
         case P54_TRAP_TIMER:
                 break;
+        case P54_TRAP_FAA_RADIO_OFF:
+                wiphy_rfkill_set_hw_state(priv->hw->wiphy, true);
+                break;
+        case P54_TRAP_FAA_RADIO_ON:
+                wiphy_rfkill_set_hw_state(priv->hw->wiphy, false);
+                break;
         default:
                 printk(KERN_INFO "%s: received event:%x freq:%d\n",
                        wiphy_name(priv->hw->wiphy), event, freq);