Merge "net: Kernel changes for Generic Software Bridge(GSB)" (f8d89690) · Commits · e / devices / android_kernel_fairphone_FP3

net/core/dev.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -4171,6 +4171,9 @@ static inline int nf_ingress(struct sk_buff skb, struct packet_type *pt_prev,
		return 0;
		}

		int (gsb_nw_stack_recv)(struct sk_buff skb) __rcu __read_mostly;
		EXPORT_SYMBOL(gsb_nw_stack_recv);

		int (athrs_fast_nat_recv)(struct sk_buff skb) __rcu __read_mostly;
		EXPORT_SYMBOL(athrs_fast_nat_recv);

		@@ -4185,6 +4188,7 @@ static int __netif_receive_skb_core(struct sk_buff *skb, bool pfmemalloc)
		bool deliver_exact = false;
		int ret = NET_RX_DROP;
		__be16 type;
		int (gsb_ns_recv)(struct sk_buff skb);
		int (fast_recv)(struct sk_buff skb);
		int (embms_recv)(struct sk_buff skb);

		@@ -4246,6 +4250,13 @@ static int __netif_receive_skb_core(struct sk_buff *skb, bool pfmemalloc)
		goto out;
		}
		#endif
		gsb_ns_recv = rcu_dereference(gsb_nw_stack_recv);
		if (gsb_ns_recv) {
		if (gsb_ns_recv(skb)) {
		ret = NET_RX_SUCCESS;
		goto out;
		}
		}
		fast_recv = rcu_dereference(athrs_fast_nat_recv);
		if (fast_recv) {
		if (fast_recv(skb)) {