diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2008-01-24 02:06:46 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:07:12 -0800 |
| commit | 79ea13ce07c951bb4d95471e7300baa0f1be9e78 (patch) | |
| tree | c0ea320464201854c5d3a222e2dd0d10ae22c95f /drivers/net/bnx2.c | |
| parent | 3e18826c73735eee5fca92584137824d9a387008 (diff) | |
| download | blackbird-op-linux-79ea13ce07c951bb4d95471e7300baa0f1be9e78.tar.gz blackbird-op-linux-79ea13ce07c951bb4d95471e7300baa0f1be9e78.zip | |
NULL noise in drivers/net
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2.c')
| -rw-r--r-- | drivers/net/bnx2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 94d1857d2c5d..3bb69d538ef0 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c @@ -2757,7 +2757,7 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget) } #ifdef BCM_VLAN - if ((status & L2_FHDR_STATUS_L2_VLAN_TAG) && (bp->vlgrp != 0)) { + if ((status & L2_FHDR_STATUS_L2_VLAN_TAG) && bp->vlgrp) { vlan_hwaccel_receive_skb(skb, bp->vlgrp, rx_hdr->l2_fhdr_vlan_tag); } @@ -5660,7 +5660,7 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev) vlan_tag_flags |= TX_BD_FLAGS_TCP_UDP_CKSUM; } - if (bp->vlgrp != 0 && vlan_tx_tag_present(skb)) { + if (bp->vlgrp && vlan_tx_tag_present(skb)) { vlan_tag_flags |= (TX_BD_FLAGS_VLAN_TAG | (vlan_tx_tag_get(skb) << 16)); } |
