Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e4ab7eb0aecbe56ac280486c61cd3f0f6c42870b

Authored by Yuri Ershov
Committed by John W. Linville
1 parent 099284bdec
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

mac80211: Put some code under MESH macro 

In the function ieee80211_subif_start_xmit the logic related with
meshdrlen is under CONFIG_MAC80211_MESH macro, but in one place it isn't.
This is some update for this

Signed-off-by: Yuri Ershov <ext-yuri.ershov@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

Showing 1 changed file with 2 additions and 0 deletions Side-by-side Diff

... ... @@ -1935,11 +1935,13 @@
1935 1935 h_pos += encaps_len;
1936 1936 }
1937 1937  
  1938 +#ifdef CONFIG_MAC80211_MESH
1938 1939 if (meshhdrlen > 0) {
1939 1940 memcpy(skb_push(skb, meshhdrlen), &mesh_hdr, meshhdrlen);
1940 1941 nh_pos += meshhdrlen;
1941 1942 h_pos += meshhdrlen;
1942 1943 }
  1944 +#endif
1943 1945  
1944 1946 if (ieee80211_is_data_qos(fc)) {
1945 1947 __le16 *qos_control;