Merge branches 'acpi-ec', 'acpi-irq' and 'acpi-quirks'

[karo-tx-linux.git] / net / mac80211 / cfg.c

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 4a388fe8c2d1363b300becd61664d333b128e845..a354f1939e49b83a5c04bcebd54952d33e8dae8d 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1107,7 +1107,7 @@ static void ieee80211_send_layer2_update(struct sta_info *sta)
        skb = dev_alloc_skb(sizeof(*msg));
        if (!skb)
                return;
-       msg = (struct iapp_layer2_update *)skb_put(skb, sizeof(*msg));
+       msg = skb_put(skb, sizeof(*msg));
 
        /* 802.2 Type 1 Logical Link Control (LLC) Exchange Identifier (XID)
         * Update response frame; IEEE Std 802.2-1998, 5.4.1.2.1 */
@@ -1876,6 +1876,7 @@ static int copy_mesh_setup(struct ieee80211_if_mesh *ifmsh,
        ifmsh->user_mpm = setup->user_mpm;
        ifmsh->mesh_auth_id = setup->auth_id;
        ifmsh->security = IEEE80211_MESH_SEC_NONE;
+       ifmsh->userspace_handles_dfs = setup->userspace_handles_dfs;
        if (setup->is_authenticated)
                ifmsh->security |= IEEE80211_MESH_SEC_AUTHED;
        if (setup->is_secure)
@@ -3413,7 +3414,7 @@ static int ieee80211_probe_client(struct wiphy *wiphy, struct net_device *dev,
 
        skb_reserve(skb, local->hw.extra_tx_headroom);
 
-       nullfunc = (void *) skb_put(skb, size);
+       nullfunc = skb_put(skb, size);
        nullfunc->frame_control = fc;
        nullfunc->duration_id = 0;
        memcpy(nullfunc->addr1, sta->sta.addr, ETH_ALEN);