From cd59c7adb867001e444819e30e1c3fa0bf26c915 Mon Sep 17 00:00:00 2001 From: Rami Rosen Date: Mon, 27 Aug 2012 23:39:24 +0000 Subject: [PATCH] --- yaml --- r: 327756 b: refs/heads/master c: d1a53dfd114a6c53464de116cdab88d934bfe92f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3e1aee404f88..d93668489dea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98d75c3724f9b37cdfdb85f821e10edcb743959e +refs/heads/master: d1a53dfd114a6c53464de116cdab88d934bfe92f diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index a5fc3e301cf2..b1e6d6385516 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -2184,9 +2184,7 @@ EXPORT_SYMBOL(netif_skb_features); /* * Returns true if either: * 1. skb has frag_list and the device doesn't support FRAGLIST, or - * 2. skb is fragmented and the device does not support SG, or if - * at least one of fragments is in highmem and device does not - * support DMA from it. + * 2. skb is fragmented and the device does not support SG. */ static inline int skb_needs_linearize(struct sk_buff *skb, int features)