aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2007-04-11 00:21:55 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:26:20 -0400
commitb0e380b1d8a8e0aca215df97702f99815f05c094 (patch)
tree95f402ca155f5211150178811669ebf0a88e8e00 /net/bridge
parentcfe1fc7759fdacb0c650b575daed1692bf3eaece (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/bridge')
-rw-r--r--net/bridge/br_netfilter.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index f2796c97b4a2..8cee7fdc16c3 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -174,7 +174,7 @@ static int br_nf_pre_routing_finish_ipv6(struct sk_buff *skb)
174 skb->dev = nf_bridge->physindev; 174 skb->dev = nf_bridge->physindev;
175 if (skb->protocol == htons(ETH_P_8021Q)) { 175 if (skb->protocol == htons(ETH_P_8021Q)) {
176 skb_push(skb, VLAN_HLEN); 176 skb_push(skb, VLAN_HLEN);
177 skb->nh.raw -= VLAN_HLEN; 177 skb->network_header -= VLAN_HLEN;
178 } 178 }
179 NF_HOOK_THRESH(PF_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL, 179 NF_HOOK_THRESH(PF_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
180 br_handle_frame_finish, 1); 180 br_handle_frame_finish, 1);
@@ -255,7 +255,7 @@ static int br_nf_pre_routing_finish_bridge(struct sk_buff *skb)
255 else { 255 else {
256 if (skb->protocol == htons(ETH_P_8021Q)) { 256 if (skb->protocol == htons(ETH_P_8021Q)) {
257 skb_pull(skb, VLAN_HLEN); 257 skb_pull(skb, VLAN_HLEN);
258 skb->nh.raw += VLAN_HLEN; 258 skb->network_header += VLAN_HLEN;
259 } 259 }
260 skb->dst->output(skb); 260 skb->dst->output(skb);
261 } 261 }
@@ -325,7 +325,7 @@ bridged_dnat:
325 if (skb->protocol == 325 if (skb->protocol ==
326 htons(ETH_P_8021Q)) { 326 htons(ETH_P_8021Q)) {
327 skb_push(skb, VLAN_HLEN); 327 skb_push(skb, VLAN_HLEN);
328 skb->nh.raw -= VLAN_HLEN; 328 skb->network_header -= VLAN_HLEN;
329 } 329 }
330 NF_HOOK_THRESH(PF_BRIDGE, NF_BR_PRE_ROUTING, 330 NF_HOOK_THRESH(PF_BRIDGE, NF_BR_PRE_ROUTING,
331 skb, skb->dev, NULL, 331 skb, skb->dev, NULL,
@@ -344,7 +344,7 @@ bridged_dnat:
344 skb->dev = nf_bridge->physindev; 344 skb->dev = nf_bridge->physindev;
345 if (skb->protocol == htons(ETH_P_8021Q)) { 345 if (skb->protocol == htons(ETH_P_8021Q)) {
346 skb_push(skb, VLAN_HLEN); 346 skb_push(skb, VLAN_HLEN);
347 skb->nh.raw -= VLAN_HLEN; 347 skb->network_header -= VLAN_HLEN;
348 } 348 }
349 NF_HOOK_THRESH(PF_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL, 349 NF_HOOK_THRESH(PF_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
350 br_handle_frame_finish, 1); 350 br_handle_frame_finish, 1);
@@ -497,7 +497,7 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb,
497 497
498 if (skb->protocol == htons(ETH_P_8021Q)) { 498 if (skb->protocol == htons(ETH_P_8021Q)) {
499 skb_pull_rcsum(skb, VLAN_HLEN); 499 skb_pull_rcsum(skb, VLAN_HLEN);
500 skb->nh.raw += VLAN_HLEN; 500 skb->network_header += VLAN_HLEN;
501 } 501 }
502 return br_nf_pre_routing_ipv6(hook, skb, in, out, okfn); 502 return br_nf_pre_routing_ipv6(hook, skb, in, out, okfn);
503 } 503 }
@@ -514,7 +514,7 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb,
514 514
515 if (skb->protocol == htons(ETH_P_8021Q)) { 515 if (skb->protocol == htons(ETH_P_8021Q)) {
516 skb_pull_rcsum(skb, VLAN_HLEN); 516 skb_pull_rcsum(skb, VLAN_HLEN);
517 skb->nh.raw += VLAN_HLEN; 517 skb->network_header += VLAN_HLEN;
518 } 518 }
519 519
520 if (!pskb_may_pull(skb, sizeof(struct iphdr))) 520 if (!pskb_may_pull(skb, sizeof(struct iphdr)))
@@ -595,7 +595,7 @@ static int br_nf_forward_finish(struct sk_buff *skb)
595 } 595 }
596 if (skb->protocol == htons(ETH_P_8021Q)) { 596 if (skb->protocol == htons(ETH_P_8021Q)) {
597 skb_push(skb, VLAN_HLEN); 597 skb_push(skb, VLAN_HLEN);
598 skb->nh.raw -= VLAN_HLEN; 598 skb->network_header -= VLAN_HLEN;
599 } 599 }
600 NF_HOOK_THRESH(PF_BRIDGE, NF_BR_FORWARD, skb, in, 600 NF_HOOK_THRESH(PF_BRIDGE, NF_BR_FORWARD, skb, in,
601 skb->dev, br_forward_finish, 1); 601 skb->dev, br_forward_finish, 1);
@@ -631,7 +631,7 @@ static unsigned int br_nf_forward_ip(unsigned int hook, struct sk_buff **pskb,
631 631
632 if (skb->protocol == htons(ETH_P_8021Q)) { 632 if (skb->protocol == htons(ETH_P_8021Q)) {
633 skb_pull(*pskb, VLAN_HLEN); 633 skb_pull(*pskb, VLAN_HLEN);
634 (*pskb)->nh.raw += VLAN_HLEN; 634 (*pskb)->network_header += VLAN_HLEN;
635 } 635 }
636 636
637 nf_bridge = skb->nf_bridge; 637 nf_bridge = skb->nf_bridge;
@@ -667,13 +667,13 @@ static unsigned int br_nf_forward_arp(unsigned int hook, struct sk_buff **pskb,
667 if (!IS_VLAN_ARP(skb)) 667 if (!IS_VLAN_ARP(skb))
668 return NF_ACCEPT; 668 return NF_ACCEPT;
669 skb_pull(*pskb, VLAN_HLEN); 669 skb_pull(*pskb, VLAN_HLEN);
670 (*pskb)->nh.raw += VLAN_HLEN; 670 (*pskb)->network_header += VLAN_HLEN;
671 } 671 }
672 672
673 if (arp_hdr(skb)->ar_pln != 4) { 673 if (arp_hdr(skb)->ar_pln != 4) {
674 if (IS_VLAN_ARP(skb)) { 674 if (IS_VLAN_ARP(skb)) {
675 skb_push(*pskb, VLAN_HLEN); 675 skb_push(*pskb, VLAN_HLEN);
676 (*pskb)->nh.raw -= VLAN_HLEN; 676 (*pskb)->network_header -= VLAN_HLEN;
677 } 677 }
678 return NF_ACCEPT; 678 return NF_ACCEPT;
679 } 679 }
@@ -723,7 +723,7 @@ static unsigned int br_nf_local_out(unsigned int hook, struct sk_buff **pskb,
723 } 723 }
724 if (skb->protocol == htons(ETH_P_8021Q)) { 724 if (skb->protocol == htons(ETH_P_8021Q)) {
725 skb_push(skb, VLAN_HLEN); 725 skb_push(skb, VLAN_HLEN);
726 skb->nh.raw -= VLAN_HLEN; 726 skb->network_header -= VLAN_HLEN;
727 } 727 }
728 728
729 NF_HOOK(PF_BRIDGE, NF_BR_FORWARD, skb, realindev, skb->dev, 729 NF_HOOK(PF_BRIDGE, NF_BR_FORWARD, skb, realindev, skb->dev,
@@ -790,7 +790,7 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb,
790 790
791 if (skb->protocol == htons(ETH_P_8021Q)) { 791 if (skb->protocol == htons(ETH_P_8021Q)) {
792 skb_pull(skb, VLAN_HLEN); 792 skb_pull(skb, VLAN_HLEN);
793 skb->nh.raw += VLAN_HLEN; 793 skb->network_header += VLAN_HLEN;
794 } 794 }
795 795
796 nf_bridge_save_header(skb); 796 nf_bridge_save_header(skb);