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

Commit 4a9d2f20 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: bridge: move nf_bridge_update_protocol to where its used 



no need to keep it in a header file.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 8bd63cf1

include/linux/netfilter_bridge.h

+0 −8
Original line number Diff line number Diff line
@@ -36,14 +36,6 @@ 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);

}



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

+8 −0
Original line number Diff line number Diff line
@@ -239,6 +239,14 @@ static int br_parse_ip_options(struct sk_buff *skb) 
	return -1;

}



static 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);

}



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

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

 * bridge PRE_ROUTING hook. */