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

Commit 946bd474 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "kernel: changes to enable tcpdump in sfe"

parents 4143c690 a1ef66e4

net/core/dev.c

+4 −3
Original line number Diff line number Diff line
@@ -4201,7 +4201,8 @@ static inline int nf_ingress(struct sk_buff *skb, struct packet_type **pt_prev, 
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;

int (*athrs_fast_nat_recv)(struct sk_buff *skb,

			   struct packet_type *pt_temp) __rcu __read_mostly;

EXPORT_SYMBOL(athrs_fast_nat_recv);



int (*embms_tm_multicast_recv)(struct sk_buff *skb) __rcu __read_mostly;
@@ -4216,7 +4217,7 @@ static int __netif_receive_skb_core(struct sk_buff *skb, bool pfmemalloc) 
	int ret = NET_RX_DROP;

	__be16 type;

	int (*gsb_ns_recv)(struct sk_buff *skb);

	int (*fast_recv)(struct sk_buff *skb);

	int (*fast_recv)(struct sk_buff *skb, struct packet_type *pt_temp);

	int (*embms_recv)(struct sk_buff *skb);



	net_timestamp_check(!netdev_tstamp_prequeue, skb);
@@ -4286,7 +4287,7 @@ static int __netif_receive_skb_core(struct sk_buff *skb, bool pfmemalloc) 
	}

	fast_recv = rcu_dereference(athrs_fast_nat_recv);

	if (fast_recv) {

		if (fast_recv(skb)) {

		if (fast_recv(skb, pt_prev)) {

			ret = NET_RX_SUCCESS;

			goto out;

		}