Re: [PATCH v4 net-next] MPLS: Use mpls_features to activate software MPLS GSO segmentation

On Tue, Jun 03, 2014 at 01:46:11PM +0900, YAMAMOTO Takashi wrote:

quoted

diff --git a/net/core/dev.c b/net/core/dev.c
index 0355ca5..7c063ac 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c

@@ -2498,13 +2498,42 @@ static int dev_gso_segment(struct sk_buff *skb, netdev_features_t features)
 	return 0;
 }
 
+/* If MPLS offload request, verify we are testing hardware MPLS features
+ * instead of standard features for the netdev.
+ */
+#ifdef CONFIG_NET_MPLS_GSO
+static netdev_features_t net_mpls_features(struct sk_buff *skb,
+					   netdev_features_t features,
+					   __be16 type)
+{
+	int tmp;

this variable seems no longer used.

Thanks, I will remove it.

quoted

+
+	if (unlikely(type == htons(ETH_P_MPLS_UC) ||
+		     type == htons(ETH_P_MPLS_MC)))

why unlikely?

Because packets are not likely to be MPLS (IMHO).
I'm happy to remove the unlikely() if you like.

otherwise,
Acked-by: YAMAMOTO Takashi <redacted>

YAMAMOTO Takashi