git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SK_BUFF]: Introduce arp_hdr(), remove skb->nh.arph
[safe/jmp/linux-2.6]
/
net
/
bridge
/
br_netfilter.c
diff --git
a/net/bridge/br_netfilter.c
b/net/bridge/br_netfilter.c
index
8a56d89
..
0ee74b1
100644
(file)
--- a/
net/bridge/br_netfilter.c
+++ b/
net/bridge/br_netfilter.c
@@
-48,8
+48,8
@@
#define skb_origaddr(skb) (((struct bridge_skb_cb *) \
(skb->nf_bridge->data))->daddr.ipv4)
#define skb_origaddr(skb) (((struct bridge_skb_cb *) \
(skb->nf_bridge->data))->daddr.ipv4)
-#define store_orig_dstaddr(skb) (skb_origaddr(skb) =
(skb)->nh.iph
->daddr)
-#define dnat_took_place(skb) (skb_origaddr(skb) !=
(skb)->nh.iph
->daddr)
+#define store_orig_dstaddr(skb) (skb_origaddr(skb) =
ip_hdr(skb)
->daddr)
+#define dnat_took_place(skb) (skb_origaddr(skb) !=
ip_hdr(skb)
->daddr)
#ifdef CONFIG_SYSCTL
static struct ctl_table_header *brnf_sysctl_header;
#ifdef CONFIG_SYSCTL
static struct ctl_table_header *brnf_sysctl_header;
@@
-265,7
+265,7
@@
static int br_nf_pre_routing_finish_bridge(struct sk_buff *skb)
static int br_nf_pre_routing_finish(struct sk_buff *skb)
{
struct net_device *dev = skb->dev;
static int br_nf_pre_routing_finish(struct sk_buff *skb)
{
struct net_device *dev = skb->dev;
- struct iphdr *iph =
skb->nh.iph
;
+ struct iphdr *iph =
ip_hdr(skb)
;
struct nf_bridge_info *nf_bridge = skb->nf_bridge;
int err;
struct nf_bridge_info *nf_bridge = skb->nf_bridge;
int err;
@@
-520,14
+520,14
@@
static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb,
if (!pskb_may_pull(skb, sizeof(struct iphdr)))
goto inhdr_error;
if (!pskb_may_pull(skb, sizeof(struct iphdr)))
goto inhdr_error;
- iph =
skb->nh.iph
;
+ iph =
ip_hdr(skb)
;
if (iph->ihl < 5 || iph->version != 4)
goto inhdr_error;
if (!pskb_may_pull(skb, 4 * iph->ihl))
goto inhdr_error;
if (iph->ihl < 5 || iph->version != 4)
goto inhdr_error;
if (!pskb_may_pull(skb, 4 * iph->ihl))
goto inhdr_error;
- iph =
skb->nh.iph
;
+ iph =
ip_hdr(skb)
;
if (ip_fast_csum((__u8 *) iph, iph->ihl) != 0)
goto inhdr_error;
if (ip_fast_csum((__u8 *) iph, iph->ihl) != 0)
goto inhdr_error;
@@
-670,7
+670,7
@@
static unsigned int br_nf_forward_arp(unsigned int hook, struct sk_buff **pskb,
(*pskb)->nh.raw += VLAN_HLEN;
}
(*pskb)->nh.raw += VLAN_HLEN;
}
- if (
skb->nh.arph
->ar_pln != 4) {
+ if (
arp_hdr(skb)
->ar_pln != 4) {
if (IS_VLAN_ARP(skb)) {
skb_push(*pskb, VLAN_HLEN);
(*pskb)->nh.raw -= VLAN_HLEN;
if (IS_VLAN_ARP(skb)) {
skb_push(*pskb, VLAN_HLEN);
(*pskb)->nh.raw -= VLAN_HLEN;