diff --git a/[refs] b/[refs] index f1cb69510069..252df7eca16b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c0dbfecbf217b47d0b508afb59b8b3639582a4c +refs/heads/master: 10f744d205dde72a0016dbdb11e239da8269958b diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index bcb3ed26af1c..887aa84fcd46 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -2621,7 +2621,7 @@ void netif_nit_deliver(struct sk_buff *skb) rcu_read_unlock(); } -int __netif_receive_skb(struct sk_buff *skb) +static int __netif_receive_skb(struct sk_buff *skb) { struct packet_type *ptype, *pt_prev; struct net_device *orig_dev;