diff options
author | Nathan Scott <nathans@sgi.com> | 2006-06-20 00:56:23 -0400 |
---|---|---|
committer | Nathan Scott <nathans@sgi.com> | 2006-06-20 00:56:23 -0400 |
commit | 98174e46974323e4941c72e46345f7277755e146 (patch) | |
tree | c4644c8f38a519cfb3929d1175fc7107eefe48b9 /drivers/net/via-velocity.c | |
parent | d8ce75324135ea7100124c1fff4ec5090a350607 (diff) | |
parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) |
Merge HEAD from ../linux-2.6
Diffstat (limited to 'drivers/net/via-velocity.c')
-rw-r--r-- | drivers/net/via-velocity.c | 10 |
1 files changed, 7 insertions, 3 deletions
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) | |||
1899 | 1899 | ||
1900 | int pktlen = skb->len; | 1900 | int pktlen = skb->len; |
1901 | 1901 | ||
1902 | #ifdef VELOCITY_ZERO_COPY_SUPPORT | ||
1903 | if (skb_shinfo(skb)->nr_frags > 6 && __skb_linearize(skb)) { | ||
1904 | kfree_skb(skb); | ||
1905 | return 0; | ||
1906 | } | ||
1907 | #endif | ||
1908 | |||
1902 | spin_lock_irqsave(&vptr->lock, flags); | 1909 | spin_lock_irqsave(&vptr->lock, flags); |
1903 | 1910 | ||
1904 | index = vptr->td_curr[qnum]; | 1911 | index = vptr->td_curr[qnum]; |
@@ -1914,8 +1921,6 @@ static int velocity_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1914 | */ | 1921 | */ |
1915 | if (pktlen < ETH_ZLEN) { | 1922 | if (pktlen < ETH_ZLEN) { |
1916 | /* Cannot occur until ZC support */ | 1923 | /* Cannot occur until ZC support */ |
1917 | if(skb_linearize(skb, GFP_ATOMIC)) | ||
1918 | return 0; | ||
1919 | pktlen = ETH_ZLEN; | 1924 | pktlen = ETH_ZLEN; |
1920 | memcpy(tdinfo->buf, skb->data, skb->len); | 1925 | memcpy(tdinfo->buf, skb->data, skb->len); |
1921 | memset(tdinfo->buf + skb->len, 0, ETH_ZLEN - skb->len); | 1926 | 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) | |||
1933 | int nfrags = skb_shinfo(skb)->nr_frags; | 1938 | int nfrags = skb_shinfo(skb)->nr_frags; |
1934 | tdinfo->skb = skb; | 1939 | tdinfo->skb = skb; |
1935 | if (nfrags > 6) { | 1940 | if (nfrags > 6) { |
1936 | skb_linearize(skb, GFP_ATOMIC); | ||
1937 | memcpy(tdinfo->buf, skb->data, skb->len); | 1941 | memcpy(tdinfo->buf, skb->data, skb->len); |
1938 | tdinfo->skb_dma[0] = tdinfo->buf_dma; | 1942 | tdinfo->skb_dma[0] = tdinfo->buf_dma; |
1939 | td_ptr->tdesc0.pktsize = | 1943 | td_ptr->tdesc0.pktsize = |