summaryrefslogtreecommitdiffstats
path: root/net/mac80211/tdls.c
diff options
context:
space:
mode:
authorArik Nemtsov <arik@wizery.com>2014-09-09 17:11:02 +0300
committerJohannes Berg <johannes.berg@intel.com>2014-09-11 12:25:22 +0200
commit59cd85cbcf2ecca9736652dc0cfd2ec600d7ef2a (patch)
treef774b6e5e60c1cd889e4b780248ba7d41de85086 /net/mac80211/tdls.c
parentb0b6aa2c8e0d0e34f7658d5cc1e4fbb59f701c42 (diff)
downloadlinux-59cd85cbcf2ecca9736652dc0cfd2ec600d7ef2a.tar.bz2
mac80211: set network header in TDLS frames
Correctly mark the network header location in mac80211-generated TDLS frames. These may be used by lower-level drivers. Signed-off-by: Arik Nemtsov <arikx.nemtsov@intel.com> Reviewed-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/tdls.c')
-rw-r--r--net/mac80211/tdls.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/tdls.c b/net/mac80211/tdls.c
index bcf51e43ccc1..4ea25dec0698 100644
--- a/net/mac80211/tdls.c
+++ b/net/mac80211/tdls.c
@@ -412,6 +412,9 @@ ieee80211_prep_tdls_encap_data(struct wiphy *wiphy, struct net_device *dev,
tf->ether_type = cpu_to_be16(ETH_P_TDLS);
tf->payload_type = WLAN_TDLS_SNAP_RFTYPE;
+ /* network header is after the ethernet header */
+ skb_set_network_header(skb, ETH_HLEN);
+
switch (action_code) {
case WLAN_TDLS_SETUP_REQUEST:
tf->category = WLAN_CATEGORY_TDLS;