Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7276ca3f authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: bridge: nf_bridge_copy_header as static inline in header 



Move nf_bridge_copy_header() as static inline in netfilter_bridge.h
header file. This patch prepares the modularization of the br_netfilter
code.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 772476df

include/linux/netfilter_bridge.h

+38 −10
Original line number Diff line number Diff line
@@ -24,16 +24,6 @@ enum nf_br_hook_priorities { 
#define BRNF_8021Q			0x10

#define BRNF_PPPoE			0x20



/* Only used in br_forward.c */

int nf_bridge_copy_header(struct sk_buff *skb);

static inline int nf_bridge_maybe_copy_header(struct sk_buff *skb)

{

	if (skb->nf_bridge &&

	    skb->nf_bridge->mask & (BRNF_BRIDGED | BRNF_BRIDGED_DNAT))

		return nf_bridge_copy_header(skb);

  	return 0;

}



static inline unsigned int nf_bridge_encap_header_len(const struct sk_buff *skb)

{

	switch (skb->protocol) {
@@ -46,6 +36,44 @@ static inline unsigned int nf_bridge_encap_header_len(const struct sk_buff *skb) 
	}

}



static inline void nf_bridge_update_protocol(struct sk_buff *skb)

{

	if (skb->nf_bridge->mask & BRNF_8021Q)

		skb->protocol = htons(ETH_P_8021Q);

	else if (skb->nf_bridge->mask & BRNF_PPPoE)

		skb->protocol = htons(ETH_P_PPP_SES);

}



/* Fill in the header for fragmented IP packets handled by

 * the IPv4 connection tracking code.

 *

 * Only used in br_forward.c

 */

static inline int nf_bridge_copy_header(struct sk_buff *skb)

{

	int err;

	unsigned int header_size;



	nf_bridge_update_protocol(skb);

	header_size = ETH_HLEN + nf_bridge_encap_header_len(skb);

	err = skb_cow_head(skb, header_size);

	if (err)

		return err;



	skb_copy_to_linear_data_offset(skb, -header_size,

				       skb->nf_bridge->data, header_size);

	__skb_push(skb, nf_bridge_encap_header_len(skb));

	return 0;

}



static inline int nf_bridge_maybe_copy_header(struct sk_buff *skb)

{

	if (skb->nf_bridge &&

	    skb->nf_bridge->mask & (BRNF_BRIDGED | BRNF_BRIDGED_DNAT))

		return nf_bridge_copy_header(skb);

  	return 0;

}



static inline unsigned int nf_bridge_mtu_reduction(const struct sk_buff *skb)

{

	if (unlikely(skb->nf_bridge->mask & BRNF_PPPoE))

net/bridge/br_netfilter.c

+0 −28
Original line number Diff line number Diff line
@@ -245,14 +245,6 @@ static inline void nf_bridge_save_header(struct sk_buff *skb) 
					 skb->nf_bridge->data, header_size);

}



static inline void nf_bridge_update_protocol(struct sk_buff *skb)

{

	if (skb->nf_bridge->mask & BRNF_8021Q)

		skb->protocol = htons(ETH_P_8021Q);

	else if (skb->nf_bridge->mask & BRNF_PPPoE)

		skb->protocol = htons(ETH_P_PPP_SES);

}



/* When handing a packet over to the IP layer

 * check whether we have a skb that is in the

 * expected format
@@ -320,26 +312,6 @@ static int br_parse_ip_options(struct sk_buff *skb) 
	return -1;

}



/* Fill in the header for fragmented IP packets handled by

 * the IPv4 connection tracking code.

 */

int nf_bridge_copy_header(struct sk_buff *skb)

{

	int err;

	unsigned int header_size;



	nf_bridge_update_protocol(skb);

	header_size = ETH_HLEN + nf_bridge_encap_header_len(skb);

	err = skb_cow_head(skb, header_size);

	if (err)

		return err;



	skb_copy_to_linear_data_offset(skb, -header_size,

				       skb->nf_bridge->data, header_size);

	__skb_push(skb, nf_bridge_encap_header_len(skb));

	return 0;

}



/* PF_BRIDGE/PRE_ROUTING *********************************************/

/* Undo the changes made for ip6tables PREROUTING and continue the

 * bridge PRE_ROUTING hook. */