Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-drm-fsl-dcu.git] / net / mac80211 / mesh_plink.c

diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c
index 7b7080e2b49f47a1dcac316432341b89b3a9a5cb..3cd5f7b5d693be131e75baeb8f7474fb4ab2bef3 100644 (file)
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
@@ -172,7 +172,7 @@ static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata,
        memcpy(mgmt->da, da, ETH_ALEN);
        memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);
        /* BSSID is left zeroed, wildcard value */
-       mgmt->u.action.category = MESH_PLINK_CATEGORY;
+       mgmt->u.action.category = WLAN_CATEGORY_MESH_PLINK;
        mgmt->u.action.u.plink_action.action_code = action;
 
        if (action == PLINK_CLOSE)