Commit f74b6a54 authored by Rami Rosen's avatar Rami Rosen Committed by John W. Linville
Browse files

mac80211: remove redundant check in ieee80211_master_start_xmit (net/mac80211/tx.c)

 - This patch (against the linux-wireless-next git tree) removes a
redundant check in ieee80211_master_start_xmit (net/mac80211/tx.c)
and adjust indentation in this method accordingly.

 In this method, there is no need to call again the
ieee80211_is_data() method; this is checked immediately before, in the
"if" command (we will not enter this block unless ieee80211_is_data()
is true, so that the "and" (&&) condition in that "if" command will be
fullfilled ).
Signed-off-by: default avatarRami Rosen <>
Acked-by: default avatarJohannes Berg <>
Signed-off-by: default avatarJohn W. Linville <>
parent cf3e74c2
...@@ -1295,16 +1295,14 @@ int ieee80211_master_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -1295,16 +1295,14 @@ int ieee80211_master_start_xmit(struct sk_buff *skb, struct net_device *dev)
if (ieee80211_vif_is_mesh(&osdata->vif) && if (ieee80211_vif_is_mesh(&osdata->vif) &&
ieee80211_is_data(hdr->frame_control)) { ieee80211_is_data(hdr->frame_control)) {
if (ieee80211_is_data(hdr->frame_control)) { if (is_multicast_ether_addr(hdr->addr3))
if (is_multicast_ether_addr(hdr->addr3)) memcpy(hdr->addr1, hdr->addr3, ETH_ALEN);
memcpy(hdr->addr1, hdr->addr3, ETH_ALEN); else
else if (mesh_nexthop_lookup(skb, osdata))
if (mesh_nexthop_lookup(skb, osdata)) return 0;
return 0; if (memcmp(odev->dev_addr, hdr->addr4, ETH_ALEN) != 0)
if (memcmp(odev->dev_addr, hdr->addr4, ETH_ALEN) != 0) IEEE80211_IFSTA_MESH_CTR_INC(&osdata->u.mesh,
IEEE80211_IFSTA_MESH_CTR_INC(&osdata->u.mesh, fwded_frames);
} else if (unlikely(osdata->vif.type == NL80211_IFTYPE_MONITOR)) { } else if (unlikely(osdata->vif.type == NL80211_IFTYPE_MONITOR)) {
struct ieee80211_sub_if_data *sdata; struct ieee80211_sub_if_data *sdata;
int hdrlen; int hdrlen;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment