a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[NETFILTER] bridge: simplify nf_bridge_pad

Browse Source 
Do some simple optimization on the nf_bridge_pad() function
and don't use magic constants. Eliminate a double call and
the #ifdef'd code for CONFIG_BRIDGE_NETFILTER.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Stephen Hemminger 2006-08-29 17:48:57 -07:00 committed by David S. Miller
parent 07317621d0
commit 9bcfcaf5e9
2 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/linux/netfilter_bridge.h
View File

@ -5,9 +5,8 @@
*/ */
#include <linux/netfilter.h> #include <linux/netfilter.h>
#if defined(__KERNEL__) && defined(CONFIG_BRIDGE_NETFILTER)
#include <linux/if_ether.h> #include <linux/if_ether.h>
#endif #include <linux/if_vlan.h>
/* Bridge Hooks */ /* Bridge Hooks */
/* After promisc drops, checksum checks. */ /* After promisc drops, checksum checks. */
@ -57,16 +56,10 @@ static inline int nf_bridge_maybe_copy_header(struct sk_buff *skb)
/* This is called by the IP fragmenting code and it ensures there is /* This is called by the IP fragmenting code and it ensures there is
* enough room for the encapsulating header (if there is one). */ * enough room for the encapsulating header (if there is one). */
static inline static inline int nf_bridge_pad(const struct sk_buff *skb)
int nf_bridge_pad(struct sk_buff *skb)
{ {
if (skb->protocol == __constant_htons(ETH_P_IP)) return (skb->nf_bridge && skb->protocol == htons(ETH_P_8021Q))
return 0; ? VLAN_HLEN : 0;
if (skb->nf_bridge) {
if (skb->protocol == __constant_htons(ETH_P_8021Q))
return 4;
}
return 0;
} }
struct bridge_skb_cb { struct bridge_skb_cb {
@ -78,6 +71,7 @@ struct bridge_skb_cb {
extern int brnf_deferred_hooks; extern int brnf_deferred_hooks;
#else #else
#define nf_bridge_maybe_copy_header(skb) (0) #define nf_bridge_maybe_copy_header(skb) (0)
#define nf_bridge_pad(skb) (0)
#endif /* CONFIG_BRIDGE_NETFILTER */ #endif /* CONFIG_BRIDGE_NETFILTER */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */

15
net/ipv4/ip_output.c
View File

@ -426,7 +426,7 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*))
int ptr; int ptr;
struct net_device *dev; struct net_device *dev;
struct sk_buff *skb2; struct sk_buff *skb2;
unsigned int mtu, hlen, left, len, ll_rs; unsigned int mtu, hlen, left, len, ll_rs, pad;
int offset; int offset;
__be16 not_last_frag; __be16 not_last_frag;
struct rtable *rt = (struct rtable*)skb->dst; struct rtable *rt = (struct rtable*)skb->dst;
@ -556,14 +556,13 @@ slow_path:
left = skb->len - hlen; /* Space per frame */ left = skb->len - hlen; /* Space per frame */
ptr = raw + hlen; /* Where to start from */ ptr = raw + hlen; /* Where to start from */
#ifdef CONFIG_BRIDGE_NETFILTER
/* for bridged IP traffic encapsulated inside f.e. a vlan header, /* for bridged IP traffic encapsulated inside f.e. a vlan header,
* we need to make room for the encapsulating header */ * we need to make room for the encapsulating header
ll_rs = LL_RESERVED_SPACE_EXTRA(rt->u.dst.dev, nf_bridge_pad(skb)); */
mtu -= nf_bridge_pad(skb); pad = nf_bridge_pad(skb);
#else ll_rs = LL_RESERVED_SPACE_EXTRA(rt->u.dst.dev, pad);
ll_rs = LL_RESERVED_SPACE(rt->u.dst.dev); mtu -= pad;
#endif
/* /*
* Fragment the datagram. * Fragment the datagram.
*/ */