summaryrefslogtreecommitdiffstats
path: root/drivers/net/3c527.c
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2006-06-23 22:46:23 +0200
committerTony Luck <tony.luck@intel.com>2006-06-23 22:46:23 +0200
commit8cf60e04a131310199d5776e2f9e915f0c468899 (patch)
tree373a68e88e6737713a0a5723d552cdeefffff929 /drivers/net/3c527.c
parentPull rework-memory-attribute-aliasing into release branch (diff)
parent[PATCH] fix silly ARM non-EABI build error (diff)
downloadlinux-8cf60e04a131310199d5776e2f9e915f0c468899.tar.xz
linux-8cf60e04a131310199d5776e2f9e915f0c468899.zip
Auto-update from upstream
Diffstat (limited to 'drivers/net/3c527.c')
-rw-r--r--drivers/net/3c527.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c
index 1b1cb0026072..157eda573925 100644
--- a/drivers/net/3c527.c
+++ b/drivers/net/3c527.c
@@ -1031,8 +1031,7 @@ static int mc32_send_packet(struct sk_buff *skb, struct net_device *dev)
return 1;
}
- skb = skb_padto(skb, ETH_ZLEN);
- if (skb == NULL) {
+ if (skb_padto(skb, ETH_ZLEN)) {
netif_wake_queue(dev);
return 0;
}