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
/
net
/
llc_pdu.h
diff --git
a/include/net/llc_pdu.h
b/include/net/llc_pdu.h
index
644f9ed
..
cbbfc37
100644
(file)
--- a/
include/net/llc_pdu.h
+++ b/
include/net/llc_pdu.h
@@
-253,9
+253,9
@@
static inline void llc_pdu_header_init(struct sk_buff *skb, u8 type,
static inline void llc_pdu_decode_sa(struct sk_buff *skb, u8 *sa)
{
if (skb->protocol == ntohs(ETH_P_802_2))
static inline void llc_pdu_decode_sa(struct sk_buff *skb, u8 *sa)
{
if (skb->protocol == ntohs(ETH_P_802_2))
- memcpy(sa,
((struct ethhdr *)skb->mac.raw
)->h_source, ETH_ALEN);
+ memcpy(sa,
eth_hdr(skb
)->h_source, ETH_ALEN);
else if (skb->protocol == ntohs(ETH_P_TR_802_2))
else if (skb->protocol == ntohs(ETH_P_TR_802_2))
- memcpy(sa,
((struct trh_hdr *)skb->mac.raw
)->saddr, ETH_ALEN);
+ memcpy(sa,
tr_hdr(skb
)->saddr, ETH_ALEN);
}
/**
}
/**
@@
-268,9
+268,9
@@
static inline void llc_pdu_decode_sa(struct sk_buff *skb, u8 *sa)
static inline void llc_pdu_decode_da(struct sk_buff *skb, u8 *da)
{
if (skb->protocol == ntohs(ETH_P_802_2))
static inline void llc_pdu_decode_da(struct sk_buff *skb, u8 *da)
{
if (skb->protocol == ntohs(ETH_P_802_2))
- memcpy(da,
((struct ethhdr *)skb->mac.raw
)->h_dest, ETH_ALEN);
+ memcpy(da,
eth_hdr(skb
)->h_dest, ETH_ALEN);
else if (skb->protocol == ntohs(ETH_P_TR_802_2))
else if (skb->protocol == ntohs(ETH_P_TR_802_2))
- memcpy(da,
((struct trh_hdr *)skb->mac.raw
)->daddr, ETH_ALEN);
+ memcpy(da,
tr_hdr(skb
)->daddr, ETH_ALEN);
}
/**
}
/**
@@
-347,7
+347,7
@@
static inline void llc_pdu_init_as_test_rsp(struct sk_buff *skb,
struct llc_pdu_un *ev_pdu = llc_pdu_un_hdr(ev_skb);
int dsize;
struct llc_pdu_un *ev_pdu = llc_pdu_un_hdr(ev_skb);
int dsize;
- dsize = ntohs(
((struct ethhdr *)ev_skb->mac.raw
)->h_proto) - 3;
+ dsize = ntohs(
eth_hdr(ev_skb
)->h_proto) - 3;
memcpy(((u8 *)pdu) + 3, ((u8 *)ev_pdu) + 3, dsize);
skb_put(skb, dsize);
}
memcpy(((u8 *)pdu) + 3, ((u8 *)ev_pdu) + 3, dsize);
skb_put(skb, dsize);
}