diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-04-11 00:21:55 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:26:20 -0400 |
commit | b0e380b1d8a8e0aca215df97702f99815f05c094 (patch) | |
tree | 95f402ca155f5211150178811669ebf0a88e8e00 /net/llc/llc_input.c | |
parent | cfe1fc7759fdacb0c650b575daed1692bf3eaece (diff) |
[SK_BUFF]: unions of just one member don't get anything done, kill them
Renaming skb->h to skb->transport_header, skb->nh to skb->network_header and
skb->mac to skb->mac_header, to match the names of the associated helpers
(skb[_[re]set]_{transport,network,mac}_header).
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/llc/llc_input.c')
-rw-r--r-- | net/llc/llc_input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/llc/llc_input.c b/net/llc/llc_input.c index b3f65d1e80b1..099ed8fec145 100644 --- a/net/llc/llc_input.c +++ b/net/llc/llc_input.c | |||
@@ -112,7 +112,7 @@ static inline int llc_fixup_skb(struct sk_buff *skb) | |||
112 | if (unlikely(!pskb_may_pull(skb, llc_len))) | 112 | if (unlikely(!pskb_may_pull(skb, llc_len))) |
113 | return 0; | 113 | return 0; |
114 | 114 | ||
115 | skb->h.raw += llc_len; | 115 | skb->transport_header += llc_len; |
116 | skb_pull(skb, llc_len); | 116 | skb_pull(skb, llc_len); |
117 | if (skb->protocol == htons(ETH_P_802_2)) { | 117 | if (skb->protocol == htons(ETH_P_802_2)) { |
118 | __be16 pdulen = eth_hdr(skb)->h_proto; | 118 | __be16 pdulen = eth_hdr(skb)->h_proto; |