git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
include
/
linux
/
if_vlan.h
diff --git
a/include/linux/if_vlan.h
b/include/linux/if_vlan.h
index
420767f
..
29b6e10
100644
(file)
--- a/
include/linux/if_vlan.h
+++ b/
include/linux/if_vlan.h
@@
-18,7
+18,6
@@
/* externally defined structs */
struct vlan_group;
struct net_device;
/* externally defined structs */
struct vlan_group;
struct net_device;
-struct sk_buff;
struct packet_type;
struct vlan_collection;
struct vlan_dev_info;
struct packet_type;
struct vlan_collection;
struct vlan_dev_info;
@@
-48,6
+47,13
@@
struct vlan_ethhdr {
unsigned short h_vlan_encapsulated_proto; /* packet type ID field (or len) */
};
unsigned short h_vlan_encapsulated_proto; /* packet type ID field (or len) */
};
+#include <linux/skbuff.h>
+
+static inline struct vlan_ethhdr *vlan_eth_hdr(const struct sk_buff *skb)
+{
+ return (struct vlan_ethhdr *)skb->mac.raw;
+}
+
struct vlan_hdr {
unsigned short h_vlan_TCI; /* Encapsulates priority and VLAN ID */
unsigned short h_vlan_encapsulated_proto; /* packet type ID field (or len) */
struct vlan_hdr {
unsigned short h_vlan_TCI; /* Encapsulates priority and VLAN ID */
unsigned short h_vlan_encapsulated_proto; /* packet type ID field (or len) */
@@
-152,7
+158,7
@@
static inline int __vlan_hwaccel_rx(struct sk_buff *skb,
skb->real_dev = skb->dev;
skb->dev = grp->vlan_devices[vlan_tag & VLAN_VID_MASK];
if (skb->dev == NULL) {
skb->real_dev = skb->dev;
skb->dev = grp->vlan_devices[vlan_tag & VLAN_VID_MASK];
if (skb->dev == NULL) {
-
kfree_skb
(skb);
+
dev_kfree_skb_any
(skb);
/* Not NET_RX_DROP, this is not being dropped
* due to congestion.
/* Not NET_RX_DROP, this is not being dropped
* due to congestion.
@@
-180,7
+186,7
@@
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.
*/
* This allows the VLAN to have a different MAC than the underlying
* device, and still route correctly.
*/
- if (!memcmp(
skb->mac.ethernet
->h_dest, skb->dev->dev_addr, ETH_ALEN))
+ if (!memcmp(
eth_hdr(skb)
->h_dest, skb->dev->dev_addr, ETH_ALEN))
skb->pkt_type = PACKET_HOST;
break;
};
skb->pkt_type = PACKET_HOST;
break;
};