diff options
-rw-r--r-- | include/linux/netdevice.h | 6 | ||||
-rw-r--r-- | net/core/dev.c | 9 |
2 files changed, 3 insertions, 12 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index e9929abeb932..18c5dc98f6dc 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -2153,16 +2153,10 @@ extern void dev_kfree_skb_any(struct sk_buff *skb); | |||
2153 | extern int netif_rx(struct sk_buff *skb); | 2153 | extern int netif_rx(struct sk_buff *skb); |
2154 | extern int netif_rx_ni(struct sk_buff *skb); | 2154 | extern int netif_rx_ni(struct sk_buff *skb); |
2155 | extern int netif_receive_skb(struct sk_buff *skb); | 2155 | extern int netif_receive_skb(struct sk_buff *skb); |
2156 | extern gro_result_t dev_gro_receive(struct napi_struct *napi, | ||
2157 | struct sk_buff *skb); | ||
2158 | extern gro_result_t napi_skb_finish(gro_result_t ret, struct sk_buff *skb); | ||
2159 | extern gro_result_t napi_gro_receive(struct napi_struct *napi, | 2156 | extern gro_result_t napi_gro_receive(struct napi_struct *napi, |
2160 | struct sk_buff *skb); | 2157 | struct sk_buff *skb); |
2161 | extern void napi_gro_flush(struct napi_struct *napi, bool flush_old); | 2158 | extern void napi_gro_flush(struct napi_struct *napi, bool flush_old); |
2162 | extern struct sk_buff * napi_get_frags(struct napi_struct *napi); | 2159 | extern struct sk_buff * napi_get_frags(struct napi_struct *napi); |
2163 | extern gro_result_t napi_frags_finish(struct napi_struct *napi, | ||
2164 | struct sk_buff *skb, | ||
2165 | gro_result_t ret); | ||
2166 | extern gro_result_t napi_gro_frags(struct napi_struct *napi); | 2160 | extern gro_result_t napi_gro_frags(struct napi_struct *napi); |
2167 | 2161 | ||
2168 | static inline void napi_free_frags(struct napi_struct *napi) | 2162 | static inline void napi_free_frags(struct napi_struct *napi) |
diff --git a/net/core/dev.c b/net/core/dev.c index 2a5f55866429..2f94df257e5a 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -3592,7 +3592,7 @@ void napi_gro_flush(struct napi_struct *napi, bool flush_old) | |||
3592 | } | 3592 | } |
3593 | EXPORT_SYMBOL(napi_gro_flush); | 3593 | EXPORT_SYMBOL(napi_gro_flush); |
3594 | 3594 | ||
3595 | enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff *skb) | 3595 | static enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff *skb) |
3596 | { | 3596 | { |
3597 | struct sk_buff **pp = NULL; | 3597 | struct sk_buff **pp = NULL; |
3598 | struct packet_offload *ptype; | 3598 | struct packet_offload *ptype; |
@@ -3683,7 +3683,6 @@ normal: | |||
3683 | ret = GRO_NORMAL; | 3683 | ret = GRO_NORMAL; |
3684 | goto pull; | 3684 | goto pull; |
3685 | } | 3685 | } |
3686 | EXPORT_SYMBOL(dev_gro_receive); | ||
3687 | 3686 | ||
3688 | static inline gro_result_t | 3687 | static inline gro_result_t |
3689 | __napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb) | 3688 | __napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb) |
@@ -3710,7 +3709,7 @@ __napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb) | |||
3710 | return dev_gro_receive(napi, skb); | 3709 | return dev_gro_receive(napi, skb); |
3711 | } | 3710 | } |
3712 | 3711 | ||
3713 | gro_result_t napi_skb_finish(gro_result_t ret, struct sk_buff *skb) | 3712 | static gro_result_t napi_skb_finish(gro_result_t ret, struct sk_buff *skb) |
3714 | { | 3713 | { |
3715 | switch (ret) { | 3714 | switch (ret) { |
3716 | case GRO_NORMAL: | 3715 | case GRO_NORMAL: |
@@ -3736,7 +3735,6 @@ gro_result_t napi_skb_finish(gro_result_t ret, struct sk_buff *skb) | |||
3736 | 3735 | ||
3737 | return ret; | 3736 | return ret; |
3738 | } | 3737 | } |
3739 | EXPORT_SYMBOL(napi_skb_finish); | ||
3740 | 3738 | ||
3741 | static void skb_gro_reset_offset(struct sk_buff *skb) | 3739 | static void skb_gro_reset_offset(struct sk_buff *skb) |
3742 | { | 3740 | { |
@@ -3788,7 +3786,7 @@ struct sk_buff *napi_get_frags(struct napi_struct *napi) | |||
3788 | } | 3786 | } |
3789 | EXPORT_SYMBOL(napi_get_frags); | 3787 | EXPORT_SYMBOL(napi_get_frags); |
3790 | 3788 | ||
3791 | gro_result_t napi_frags_finish(struct napi_struct *napi, struct sk_buff *skb, | 3789 | static gro_result_t napi_frags_finish(struct napi_struct *napi, struct sk_buff *skb, |
3792 | gro_result_t ret) | 3790 | gro_result_t ret) |
3793 | { | 3791 | { |
3794 | switch (ret) { | 3792 | switch (ret) { |
@@ -3813,7 +3811,6 @@ gro_result_t napi_frags_finish(struct napi_struct *napi, struct sk_buff *skb, | |||
3813 | 3811 | ||
3814 | return ret; | 3812 | return ret; |
3815 | } | 3813 | } |
3816 | EXPORT_SYMBOL(napi_frags_finish); | ||
3817 | 3814 | ||
3818 | static struct sk_buff *napi_frags_skb(struct napi_struct *napi) | 3815 | static struct sk_buff *napi_frags_skb(struct napi_struct *napi) |
3819 | { | 3816 | { |