projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Char: cyclades, remove unused timestamps
[powerpc.git]
/
include
/
linux
/
if_vlan.h
diff --git
a/include/linux/if_vlan.h
b/include/linux/if_vlan.h
index
d103580
..
81e9bc9
100644
(file)
--- a/
include/linux/if_vlan.h
+++ b/
include/linux/if_vlan.h
@@
-51,7
+51,7
@@
struct vlan_ethhdr {
static inline struct vlan_ethhdr *vlan_eth_hdr(const struct sk_buff *skb)
{
static inline struct vlan_ethhdr *vlan_eth_hdr(const struct sk_buff *skb)
{
- return (struct vlan_ethhdr *)skb
->mac.raw
;
+ return (struct vlan_ethhdr *)skb
_mac_header(skb)
;
}
struct vlan_hdr {
}
struct vlan_hdr {
@@
-275,8
+275,8
@@
static inline struct sk_buff *__vlan_put_tag(struct sk_buff *skb, unsigned short
veth->h_vlan_TCI = htons(tag);
skb->protocol = __constant_htons(ETH_P_8021Q);
veth->h_vlan_TCI = htons(tag);
skb->protocol = __constant_htons(ETH_P_8021Q);
- skb->mac
.raw
-= VLAN_HLEN;
- skb->n
h.raw
-= VLAN_HLEN;
+ skb->mac
_header
-= VLAN_HLEN;
+ skb->n
etwork_header
-= VLAN_HLEN;
return skb;
}
return skb;
}