diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 08:41:41 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 13:07:53 -0400 |
| commit | 816724e65c72a90a44fbad0ef0b59b186c85fa90 (patch) | |
| tree | 421fa29aedff988e392f92780637553e275d37a0 /drivers/net/arm/ether3.c | |
| parent | 70ac4385a13f78bc478f26d317511893741b05bd (diff) | |
| parent | d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
fs/nfs/inode.c
fs/super.c
Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'
Diffstat (limited to 'drivers/net/arm/ether3.c')
| -rw-r--r-- | drivers/net/arm/ether3.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/arm/ether3.c b/drivers/net/arm/ether3.c index f1d5b1027ff7..081074180e62 100644 --- a/drivers/net/arm/ether3.c +++ b/drivers/net/arm/ether3.c | |||
| @@ -518,8 +518,7 @@ ether3_sendpacket(struct sk_buff *skb, struct net_device *dev) | |||
| 518 | 518 | ||
| 519 | length = (length + 1) & ~1; | 519 | length = (length + 1) & ~1; |
| 520 | if (length != skb->len) { | 520 | if (length != skb->len) { |
| 521 | skb = skb_padto(skb, length); | 521 | if (skb_padto(skb, length)) |
| 522 | if (skb == NULL) | ||
| 523 | goto out; | 522 | goto out; |
| 524 | } | 523 | } |
| 525 | 524 | ||