diff options
| author | Patrick McHardy <kaber@trash.net> | 2009-07-05 19:23:38 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-05 19:23:38 -0700 |
| commit | ec634fe328182a1a098585bfc7b69e5042bdb08d (patch) | |
| tree | 02883aaee743af10d78d6d8fe9181944b4dd4529 /net/core/dev.c | |
| parent | a73e76e23c20c05cb8c0b7ba8bc9daa04b05c80f (diff) | |
| download | lwn-ec634fe328182a1a098585bfc7b69e5042bdb08d.tar.gz lwn-ec634fe328182a1a098585bfc7b69e5042bdb08d.zip | |
net: convert remaining non-symbolic return values in ndo_start_xmit() functions
This patch converts the remaining occurences of raw return values to their
symbolic counterparts in ndo_start_xmit() functions that were missed by the
previous automatic conversion.
Additionally code that assumed the symbolic value of NETDEV_TX_OK to be zero
is changed to explicitly use NETDEV_TX_OK.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 70c27e0c7c32..dca8b5000d3b 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1704,7 +1704,7 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev, skb_dst_drop(skb); rc = ops->ndo_start_xmit(skb, dev); - if (rc == 0) + if (rc == NETDEV_TX_OK) txq_trans_update(txq); /* * TODO: if skb_orphan() was called by @@ -1730,7 +1730,7 @@ gso: skb->next = nskb->next; nskb->next = NULL; rc = ops->ndo_start_xmit(nskb, dev); - if (unlikely(rc)) { + if (unlikely(rc != NETDEV_TX_OK)) { nskb->next = skb->next; skb->next = nskb; return rc; @@ -1744,7 +1744,7 @@ gso: out_kfree_skb: kfree_skb(skb); - return 0; + return NETDEV_TX_OK; } static u32 skb_tx_hashrnd; |