From: Patrick McHardy <kaber@trash.net>
Date: Wed, 1 May 2013 22:36:49 +0000 (+0000)
Subject: net: use netdev_features_t in skb_needs_linearize()
X-Git-Tag: v3.4.46~22
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=7433ca9c45b8a8c98de9cd57f84d107d05925102;p=unionfs-2.6.38.y.git

net: use netdev_features_t in skb_needs_linearize()

[ Upstream commit 6708c9e5cc9bfc7c9a00ce9c0fdd0b1d4952b3d1 ]

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/net/core/dev.c b/net/core/dev.c
index dd12421b9e8..7db83d64e4f 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2170,7 +2170,7 @@ EXPORT_SYMBOL(netif_skb_features);
  *	   support DMA from it.
  */
 static inline int skb_needs_linearize(struct sk_buff *skb,
-				      int features)
+				      netdev_features_t features)
 {
 	return skb_is_nonlinear(skb) &&
 			((skb_has_frag_list(skb) &&