aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/mesh_hwmp.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-11-18 12:42:05 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-11-18 17:09:27 -0500
commit62ae67be31c2346b6d74653a148ddbd1b9a94424 (patch)
tree91f59c821a4e3f91a529887d97989b1969720f65 /net/mac80211/mesh_hwmp.c
parent875405a7793e9c35fab33819e7e5df7a98b6064c (diff)
mac80211: remove encrypt parameter from ieee80211_tx_skb
Since the flags moved into skb->cb, there's no longer a need to have the encrypt bool passed into the function, anyone who requires it set to 0 (false) can just set the flag directly. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/mesh_hwmp.c')
-rw-r--r--net/mac80211/mesh_hwmp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index d93019874e41..9aecf0207afc 100644
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@ -187,7 +187,7 @@ static int mesh_path_sel_frame_tx(enum mpath_frame_type action, u8 flags,
187 memcpy(pos, &target_sn, 4); 187 memcpy(pos, &target_sn, 4);
188 } 188 }
189 189
190 ieee80211_tx_skb(sdata, skb, 1); 190 ieee80211_tx_skb(sdata, skb);
191 return 0; 191 return 0;
192} 192}
193 193
@@ -250,7 +250,7 @@ int mesh_path_error_tx(u8 ttl, u8 *target, __le32 target_sn,
250 pos += 4; 250 pos += 4;
251 memcpy(pos, &target_rcode, 2); 251 memcpy(pos, &target_rcode, 2);
252 252
253 ieee80211_tx_skb(sdata, skb, 1); 253 ieee80211_tx_skb(sdata, skb);
254 return 0; 254 return 0;
255} 255}
256 256