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/sctp/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/sctp/input.c')
-rw-r--r-- | net/sctp/input.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/sctp/input.c b/net/sctp/input.c index f38e91b38719..87feee166da9 100644 --- a/net/sctp/input.c +++ b/net/sctp/input.c | |||
@@ -522,14 +522,14 @@ void sctp_v4_err(struct sk_buff *skb, __u32 info) | |||
522 | } | 522 | } |
523 | 523 | ||
524 | /* Fix up skb to look at the embedded net header. */ | 524 | /* Fix up skb to look at the embedded net header. */ |
525 | saveip = skb->nh.raw; | 525 | saveip = skb->network_header; |
526 | savesctp = skb->h.raw; | 526 | savesctp = skb->transport_header; |
527 | skb_reset_network_header(skb); | 527 | skb_reset_network_header(skb); |
528 | skb_set_transport_header(skb, ihlen); | 528 | skb_set_transport_header(skb, ihlen); |
529 | sk = sctp_err_lookup(AF_INET, skb, sctp_hdr(skb), &asoc, &transport); | 529 | sk = sctp_err_lookup(AF_INET, skb, sctp_hdr(skb), &asoc, &transport); |
530 | /* Put back, the original pointers. */ | 530 | /* Put back, the original pointers. */ |
531 | skb->nh.raw = saveip; | 531 | skb->network_header = saveip; |
532 | skb->h.raw = savesctp; | 532 | skb->transport_header = savesctp; |
533 | if (!sk) { | 533 | if (!sk) { |
534 | ICMP_INC_STATS_BH(ICMP_MIB_INERRORS); | 534 | ICMP_INC_STATS_BH(ICMP_MIB_INERRORS); |
535 | return; | 535 | return; |