aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
authorChun-Yeow Yeoh <yeohchunyeow@gmail.com>2013-11-13 02:39:12 -0500
committerJohannes Berg <johannes.berg@intel.com>2013-11-25 14:51:55 -0500
commitf63f8421d468575ae7bb62cfcf0398613c746975 (patch)
treeba488d36f60f7b5f1b6cf30431552c0eeaa9f910 /net/mac80211/rx.c
parent6f101ef04b77bcad71049e07007d34d14cab7b2f (diff)
mac80211: use put_unaligned_le in mesh when necessary
Use put_unaligned_le16 and put_unaligned_le32 for mesh_path_error_tx and mesh_path_sel_frame_tx. Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@gmail.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r--net/mac80211/rx.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 79f76791f77a..30ac6099da06 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -2081,7 +2081,6 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
2081 struct ieee80211_sub_if_data *sdata = rx->sdata; 2081 struct ieee80211_sub_if_data *sdata = rx->sdata;
2082 struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); 2082 struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
2083 struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; 2083 struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
2084 __le16 reason = cpu_to_le16(WLAN_REASON_MESH_PATH_NOFORWARD);
2085 u16 q, hdrlen; 2084 u16 q, hdrlen;
2086 2085
2087 hdr = (struct ieee80211_hdr *) skb->data; 2086 hdr = (struct ieee80211_hdr *) skb->data;
@@ -2189,7 +2188,9 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
2189 } else { 2188 } else {
2190 /* unable to resolve next hop */ 2189 /* unable to resolve next hop */
2191 mesh_path_error_tx(sdata, ifmsh->mshcfg.element_ttl, 2190 mesh_path_error_tx(sdata, ifmsh->mshcfg.element_ttl,
2192 fwd_hdr->addr3, 0, reason, fwd_hdr->addr2); 2191 fwd_hdr->addr3, 0,
2192 WLAN_REASON_MESH_PATH_NOFORWARD,
2193 fwd_hdr->addr2);
2193 IEEE80211_IFSTA_MESH_CTR_INC(ifmsh, dropped_frames_no_route); 2194 IEEE80211_IFSTA_MESH_CTR_INC(ifmsh, dropped_frames_no_route);
2194 kfree_skb(fwd_skb); 2195 kfree_skb(fwd_skb);
2195 return RX_DROP_MONITOR; 2196 return RX_DROP_MONITOR;