2013-08-29 21:35:10

by Sergey Ryazanov

Subject: [PATCH] mac80211: Remove superfluous is_multicast_ether_addr() call

Remove superfluous call and use locally stored previous result.

Signed-off-by: Sergey Ryazanov <[email protected]>
---
net/mac80211/tx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 3456c04..102ce8a 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1981,7 +1981,7 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
* EAPOL frames from the local station.
*/
if (unlikely(!ieee80211_vif_is_mesh(&sdata->vif) &&
- !is_multicast_ether_addr(hdr.addr1) && !authorized &&
+ !multicast && !authorized &&
(cpu_to_be16(ethertype) != sdata->control_port_protocol ||
!ether_addr_equal(sdata->vif.addr, skb->data + ETH_ALEN)))) {
#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
--
1.8.1.5

2013-08-30 10:03:17

by Johannes Berg

Subject: Re: [PATCH] mac80211: Remove superfluous is_multicast_ether_addr() call

On Fri, 2013-08-30 at 01:35 +0400, Sergey Ryazanov wrote:
> Remove superfluous call and use locally stored previous result.

Applied, thanks.

johannes