Commit f74b6a54 authored Oct 02, 2008 by Rami Rosen Committed by John W. Linville Oct 06, 2008

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: Rami Rosen <ramirose@gmail.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent cf3e74c2

net/mac80211/tx.c

+8 −10

Original line number	Diff line number	Diff line
		@@ -1295,7 +1295,6 @@ int ieee80211_master_start_xmit(struct sk_buff skb, struct net_device dev)

		if (ieee80211_vif_is_mesh(&osdata->vif) &&
		ieee80211_is_data(hdr->frame_control)) {
		if (ieee80211_is_data(hdr->frame_control)) {
		if (is_multicast_ether_addr(hdr->addr3))
		memcpy(hdr->addr1, hdr->addr3, ETH_ALEN);
		else
		@@ -1304,7 +1303,6 @@ int ieee80211_master_start_xmit(struct sk_buff skb, struct net_device dev)
		if (memcmp(odev->dev_addr, hdr->addr4, ETH_ALEN) != 0)
		IEEE80211_IFSTA_MESH_CTR_INC(&osdata->u.mesh,
		fwded_frames);
		}
		} else if (unlikely(osdata->vif.type == NL80211_IFTYPE_MONITOR)) {
		struct ieee80211_sub_if_data *sdata;
		int hdrlen;

Admin message