[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>

2 files changed, 8 insertions, 8 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)
         }
 
         /* Fix up skb to look at the embedded net header. */
-        saveip = skb->nh.raw;
-        savesctp  = skb->h.raw;
+        saveip = skb->network_header;
+        savesctp = skb->transport_header;
         skb_reset_network_header(skb);
         skb_set_transport_header(skb, ihlen);
         sk = sctp_err_lookup(AF_INET, skb, sctp_hdr(skb), &asoc, &transport);
         /* Put back, the original pointers. */
-        skb->nh.raw = saveip;
-        skb->h.raw = savesctp;
+        skb->network_header = saveip;
+        skb->transport_header = savesctp;
         if (!sk) {
                 ICMP_INC_STATS_BH(ICMP_MIB_INERRORS);
                 return;
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index cd0af9238782..afcb0093c290 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -132,14 +132,14 @@ SCTP_STATIC void sctp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
         idev = in6_dev_get(skb->dev);
 
         /* Fix up skb to look at the embedded net header. */
-        saveip = skb->nh.raw;
-        savesctp  = skb->h.raw;
+        saveip   = skb->network_header;
+        savesctp = skb->transport_header;
         skb_reset_network_header(skb);
         skb_set_transport_header(skb, offset);
         sk = sctp_err_lookup(AF_INET6, skb, sctp_hdr(skb), &asoc, &transport);
         /* Put back, the original pointers. */
-        skb->nh.raw = saveip;
-        skb->h.raw = savesctp;
+        skb->network_header   = saveip;
+        skb->transport_header = savesctp;
         if (!sk) {
                 ICMP6_INC_STATS_BH(idev, ICMP6_MIB_INERRORS);
                 goto out;