diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 15:00:01 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 15:00:01 (GMT) |
| commit | 199f4c9f76fd8b030405abddf294e771f888de03 (patch) | |
| tree | ee4f104a7562e1fd76882bc40f2de7d90812e1df /drivers/net/lasi_82596.c | |
| parent | 37224470c8c6d90a4062e76a08d4dc1fcf91fc89 (diff) | |
| parent | ca6bb5d7ab22ac79f608fe6cbc6b12de6a5a19f0 (diff) | |
| download | linux-fsl-qoriq-199f4c9f76fd8b030405abddf294e771f888de03.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NET]: Require CAP_NET_ADMIN to create tuntap devices.
[NET]: fix net-core kernel-doc
[TCP]: Move inclusion of <linux/dmaengine.h> to correct place in <linux/tcp.h>
[IPSEC]: Handle GSO packets
[NET]: Added GSO toggle
[NET]: Add software TSOv4
[NET]: Add generic segmentation offload
[NET]: Merge TSO/UFO fields in sk_buff
[NET]: Prevent transmission after dev_deactivate
[IPV6] ADDRCONF: Fix default source address selection without CONFIG_IPV6_PRIVACY
[IPV6]: Fix source address selection.
[NET]: Avoid allocating skb in skb_pad
Diffstat (limited to 'drivers/net/lasi_82596.c')
| -rw-r--r-- | drivers/net/lasi_82596.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/lasi_82596.c b/drivers/net/lasi_82596.c index 957888d..1ab0944 100644 --- a/drivers/net/lasi_82596.c +++ b/drivers/net/lasi_82596.c @@ -1083,8 +1083,7 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev) skb->len, skb->data)); if (length < ETH_ZLEN) { - skb = skb_padto(skb, ETH_ZLEN); - if (skb == NULL) + if (skb_padto(skb, ETH_ZLEN)) return 0; length = ETH_ZLEN; } |