diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-14 21:57:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-14 21:57:06 -0700 |
| commit | 76aba64a6608fcaa02c715e93c572192f3621195 (patch) | |
| tree | 9a4fd0b0afa3c71e0fee04710b55e19ebafb7924 /include/linux | |
| parent | 52393ccc0a53c130f31fbbdb8b40b2aadb55ee72 (diff) | |
| parent | 0610d11b53ad15200618e38e4511373e3ed09e8a (diff) | |
| download | lwn-76aba64a6608fcaa02c715e93c572192f3621195.tar.gz lwn-76aba64a6608fcaa02c715e93c572192f3621195.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[VLAN]: __vlan_hwaccel_rx can use the faster ether_compare_addr
[PKT_SCHED] HTB: initialize upper bound properly
[IPV4]: Clear skb cb on IP input
[NET]: Update frag_list in pskb_trim
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/if_vlan.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index eef0876d8307..383627ad328f 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(struct sk_buff *skb, * 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; }; |