---

yaml --- r: 327756 b: refs/heads/master c: d1a53df h: refs/heads/master v: v3
git-mirror · Aug 31, 2012 · cd59c7a · cd59c7a
1 parent 1bdb3dc
commit cd59c7a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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)