commit 946bd4744feebaf9899537933603777becdc9273
author Linux Build Service Account <lnxbuild@localhost> Tue Oct 09 08:58:18 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Oct 09 08:58:17 2018 -0700
tree c6dc8268f100a1f5261636b1749a0c017e7ecffa
parent 4143c6901ca74e784198699aa46bda184176c617
parent a1ef66e4fff1df610424f6b5da787257f0b23205

Merge "kernel: changes to enable tcpdump in sfe"

net/core/dev.c

diff --git a/net/core/dev.c b/net/core/dev.c
index c6a8932..8d5517c 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4201,7 +4201,8 @@
 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 @@
 	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 @@
 	}
 	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;
 		}