diff mbox

[net-next] net: replace last open coded skb_orphan_frags with function call

Message ID 1433778788-16971-1-git-send-email-willemb@google.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Willem de Bruijn June 8, 2015, 3:53 p.m. UTC 
From: Willem de Bruijn <willemb@google.com>

Commit 70008aa50e92 ("skbuff: convert to skb_orphan_frags") replaced
open coded tests of SKBTX_DEV_ZEROCOPY and skb_copy_ubufs with calls
to helper function skb_orphan_frags. Apply that to the last remaining
open coded site.

Signed-off-by: Willem de Bruijn <willemb@google.com>
---
 net/core/dev.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

Comments

Michael S. Tsirkin June 8, 2015, 3:54 p.m. UTC | #1 
On Mon, Jun 08, 2015 at 11:53:08AM -0400, Willem de Bruijn wrote:
> From: Willem de Bruijn <willemb@google.com>
> 
> Commit 70008aa50e92 ("skbuff: convert to skb_orphan_frags") replaced
> open coded tests of SKBTX_DEV_ZEROCOPY and skb_copy_ubufs with calls
> to helper function skb_orphan_frags. Apply that to the last remaining
> open coded site.
> 
> Signed-off-by: Willem de Bruijn <willemb@google.com>

Acked-by: Michael S. Tsirkin <mst@redhat.com>

> ---
>  net/core/dev.c | 11 ++---------
>  1 file changed, 2 insertions(+), 9 deletions(-)
> 
> diff --git a/net/core/dev.c b/net/core/dev.c
> index 0602e91..6778a99 100644
> --- a/net/core/dev.c
> +++ b/net/core/dev.c
> @@ -1723,15 +1723,8 @@ EXPORT_SYMBOL_GPL(is_skb_forwardable);
>  
>  int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
>  {
> -	if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
> -		if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
> -			atomic_long_inc(&dev->rx_dropped);
> -			kfree_skb(skb);
> -			return NET_RX_DROP;
> -		}
> -	}
> -
> -	if (unlikely(!is_skb_forwardable(dev, skb))) {
> +	if (skb_orphan_frags(skb, GFP_ATOMIC) ||
> +	    unlikely(!is_skb_forwardable(dev, skb))) {
>  		atomic_long_inc(&dev->rx_dropped);
>  		kfree_skb(skb);
>  		return NET_RX_DROP;
> -- 
> 2.2.0.rc0.207.ga3a616c
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller June 8, 2015, 7:15 p.m. UTC | #2 
From: Willem de Bruijn <willemb@google.com>
Date: Mon,  8 Jun 2015 11:53:08 -0400

> From: Willem de Bruijn <willemb@google.com>
> 
> Commit 70008aa50e92 ("skbuff: convert to skb_orphan_frags") replaced
> open coded tests of SKBTX_DEV_ZEROCOPY and skb_copy_ubufs with calls
> to helper function skb_orphan_frags. Apply that to the last remaining
> open coded site.
> 
> Signed-off-by: Willem de Bruijn <willemb@google.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/core/dev.c b/net/core/dev.c
index 0602e91..6778a99 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1723,15 +1723,8 @@  EXPORT_SYMBOL_GPL(is_skb_forwardable);
 
 int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
 {
-	if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
-		if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
-			atomic_long_inc(&dev->rx_dropped);
-			kfree_skb(skb);
-			return NET_RX_DROP;
-		}
-	}
-
-	if (unlikely(!is_skb_forwardable(dev, skb))) {
+	if (skb_orphan_frags(skb, GFP_ATOMIC) ||
+	    unlikely(!is_skb_forwardable(dev, skb))) {
 		atomic_long_inc(&dev->rx_dropped);
 		kfree_skb(skb);
 		return NET_RX_DROP;