[PATCH] VLAN code can use the faster ether_compare_addr

[PATCH] VLAN code can use the faster ether_compare_addr

[Stephen Hemminger]

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: Stephen Hemminger <shemminger@osdl.org>

---

 include/linux/if_vlan.h |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

1738bd3d785bb3f9fa24e26f98b8d86e7783eadf
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index eef0876..383627a 100644
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -23,8 +23,8 @@ struct vlan_collection;
 struct vlan_dev_info;
 struct hlist_node;
 
-#include <linux/proc_fs.h> /* for proc_dir_entry */
 #include <linux/netdevice.h>
+#include <linux/etherdevice.h>
 
 #define VLAN_HLEN	4		/* The additional bytes (on top of the Ethernet header)
 					 * that VLAN requires.
@@ -185,7 +185,8 @@ static inline int __vlan_hwaccel_rx(stru
 		 * This allows the VLAN to have a different MAC than the underlying
 		 * 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;
 		break;
 	};
-- 
1.2.4

Re: [PATCH] VLAN code can use the faster ether_compare_addr

[Ben Greear]

Stephen Hemminger wrote:
> 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.

Looks fine to me.

Ben

> 
> Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
> 
> ---
> 
>  include/linux/if_vlan.h |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> 1738bd3d785bb3f9fa24e26f98b8d86e7783eadf
> diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
> index eef0876..383627a 100644
> --- a/include/linux/if_vlan.h
> +++ b/include/linux/if_vlan.h
> @@ -23,8 +23,8 @@ struct vlan_collection;
>  struct vlan_dev_info;
>  struct hlist_node;
>  
> -#include <linux/proc_fs.h> /* for proc_dir_entry */
>  #include <linux/netdevice.h>
> +#include <linux/etherdevice.h>
>  
>  #define VLAN_HLEN	4		/* The additional bytes (on top of the Ethernet header)
>  					 * that VLAN requires.
> @@ -185,7 +185,8 @@ static inline int __vlan_hwaccel_rx(stru
>  		 * This allows the VLAN to have a different MAC than the underlying
>  		 * 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;
>  		break;
>  	};


-- 
Ben Greear <greearb@candelatech.com>
Candela Technologies Inc  http://www.candelatech.com

Re: [PATCH] VLAN code can use the faster ether_compare_addr

[David Miller]

From: Ben Greear <greearb@candelatech.com>
Date: Fri, 14 Jul 2006 14:36:17 -0700

> Stephen Hemminger wrote:
> > 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.
> 
> Looks fine to me.

To me too, applied, thanks a lot.