Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0610d11b authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

[VLAN]: __vlan_hwaccel_rx can use the faster ether_compare_addr 



The inline function compare_ether_addr is faster than memcmp.
Also, don't need to drag in proc_fs.h, the only reference to proc_dir_entry
is a pointer so the declaration is needed here.

Signed-off-by: default avatarStephen Hemminger <shemminger@osdl.org>
Acked-by: default avatarBen Greear <greearb@candelatech.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b3a62519

include/linux/if_vlan.h

+3 −2
Original line number Original line Diff line number Diff line
@@ -23,8 +23,8 @@ struct vlan_collection; 
struct vlan_dev_info;

struct vlan_dev_info;

struct hlist_node;

struct hlist_node;





#include <linux/proc_fs.h> /* for proc_dir_entry */

#include <linux/netdevice.h>

#include <linux/netdevice.h>

#include <linux/etherdevice.h>





#define VLAN_HLEN	4		/* The additional bytes (on top of the Ethernet header)

#define VLAN_HLEN	4		/* The additional bytes (on top of the Ethernet header)

					 * that VLAN requires.

					 * that VLAN requires.
@@ -185,7 +185,8 @@ static inline int __vlan_hwaccel_rx(struct sk_buff *skb, 
		 * This allows the VLAN to have a different MAC than the underlying

		 * This allows the VLAN to have a different MAC than the underlying

		 * device, and still route correctly.

		 * device, and still route correctly.

		 */

		 */

		if (!memcmp(eth_hdr(skb)->h_dest, skb->dev->dev_addr, ETH_ALEN))

		if (!compare_ether_addr(eth_hdr(skb)->h_dest,

				       	skb->dev->dev_addr))

			skb->pkt_type = PACKET_HOST;

			skb->pkt_type = PACKET_HOST;

		break;

		break;

	};

	};