3 files changed, 9 insertions, 6 deletions

diff --git a/drivers/block/aoe/aoenet.c b/drivers/block/aoe/aoenet.c
index fdff774b8ab9..c1434ed11880 100644
--- a/drivers/block/aoe/aoenet.c
+++ b/drivers/block/aoe/aoenet.c
@@ -116,8 +116,7 @@ aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt,
         skb = skb_share_check(skb, GFP_ATOMIC);
         if (skb == NULL)
                 return 0;
-        if (skb_is_nonlinear(skb))
-        if (skb_linearize(skb, GFP_ATOMIC) < 0)
+        if (skb_linearize(skb))
                 goto exit;
         if (!is_aoe_netif(ifp))
                 goto exit;
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 411f4d809c47..625ff61c9988 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -1200,7 +1200,7 @@ static int mv643xx_eth_start_xmit(struct sk_buff *skb, struct net_device *dev)
         }
 
         if (has_tiny_unaligned_frags(skb)) {
-                if ((skb_linearize(skb, GFP_ATOMIC) != 0)) {
+                if (__skb_linearize(skb)) {
                         stats->tx_dropped++;
                         printk(KERN_DEBUG "%s: failed to linearize tiny "
                                         "unaligned fragment\n", dev->name);
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index ed1f837c8fda..2eb6b5f9ba0d 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -1899,6 +1899,13 @@ static int velocity_xmit(struct sk_buff *skb, struct net_device *dev)
 
         int pktlen = skb->len;
 
+#ifdef VELOCITY_ZERO_COPY_SUPPORT
+        if (skb_shinfo(skb)->nr_frags > 6 && __skb_linearize(skb)) {
+                kfree_skb(skb);
+                return 0;
+        }
+#endif
+
         spin_lock_irqsave(&vptr->lock, flags);
 
         index = vptr->td_curr[qnum];
@@ -1914,8 +1921,6 @@ static int velocity_xmit(struct sk_buff *skb, struct net_device *dev)
          */
         if (pktlen < ETH_ZLEN) {
                 /* Cannot occur until ZC support */
-                if(skb_linearize(skb, GFP_ATOMIC))
-                        return 0; 
                 pktlen = ETH_ZLEN;
                 memcpy(tdinfo->buf, skb->data, skb->len);
                 memset(tdinfo->buf + skb->len, 0, ETH_ZLEN - skb->len);
@@ -1933,7 +1938,6 @@ static int velocity_xmit(struct sk_buff *skb, struct net_device *dev)
                 int nfrags = skb_shinfo(skb)->nr_frags;
                 tdinfo->skb = skb;
                 if (nfrags > 6) {
-                        skb_linearize(skb, GFP_ATOMIC);
                         memcpy(tdinfo->buf, skb->data, skb->len);
                         tdinfo->skb_dma[0] = tdinfo->buf_dma;
                         td_ptr->tdesc0.pktsize =