Commit 79ea13ce authored by Al Viro's avatar Al Viro Committed by David S. Miller
Browse files

NULL noise in drivers/net 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3e18826c

drivers/net/3c515.c

+1 −1
Original line number Diff line number Diff line
@@ -1361,7 +1361,7 @@ static int boomerang_rx(struct net_device *dev) 
			/* Check if the packet is long enough to just accept without

			   copying to a properly sized skbuff. */

			if (pkt_len < rx_copybreak

			    && (skb = dev_alloc_skb(pkt_len + 4)) != 0) {

			    && (skb = dev_alloc_skb(pkt_len + 4)) != NULL) {

				skb_reserve(skb, 2);	/* Align IP on 16 byte boundaries */

				/* 'skb_put()' points to the start of sk_buff data area. */

				memcpy(skb_put(skb, pkt_len),

drivers/net/7990.c

+3 −5
Original line number Diff line number Diff line
@@ -277,8 +277,6 @@ static int lance_rx (struct net_device *dev) 
        volatile struct lance_init_block *ib = lp->init_block;

        volatile struct lance_rx_desc *rd;

        unsigned char bits;

        int len = 0;                    /* XXX shut up gcc warnings */

        struct sk_buff *skb = 0;        /* XXX shut up gcc warnings */

#ifdef TEST_HITS

        int i;

#endif
@@ -318,10 +316,10 @@ static int lance_rx (struct net_device *dev) 
                        if (bits & LE_R1_FRA) dev->stats.rx_frame_errors++;

                        if (bits & LE_R1_EOP) dev->stats.rx_errors++;

                } else {

                        len = (rd->mblength & 0xfff) - 4;

                        skb = dev_alloc_skb (len+2);

			int len = (rd->mblength & 0xfff) - 4;

			struct sk_buff *skb = dev_alloc_skb (len+2);



                        if (skb == 0) {

                        if (!skb) {

                                printk ("%s: Memory squeeze, deferring packet.\n",

                                        dev->name);

                                dev->stats.rx_dropped++;

drivers/net/a2065.c

+4 −6
Original line number Diff line number Diff line
@@ -269,8 +269,6 @@ static int lance_rx (struct net_device *dev) 
	volatile struct lance_regs *ll = lp->ll;

	volatile struct lance_rx_desc *rd;

	unsigned char bits;

	int len = 0;			/* XXX shut up gcc warnings */

	struct sk_buff *skb = 0;	/* XXX shut up gcc warnings */



#ifdef TEST_HITS

	int i;
@@ -306,10 +304,10 @@ static int lance_rx (struct net_device *dev) 
			if (bits & LE_R1_FRA) dev->stats.rx_frame_errors++;

			if (bits & LE_R1_EOP) dev->stats.rx_errors++;

		} else {

			len = (rd->mblength & 0xfff) - 4;

			skb = dev_alloc_skb (len+2);

			int len = (rd->mblength & 0xfff) - 4;

			struct sk_buff *skb = dev_alloc_skb (len+2);



			if (skb == 0) {

			if (!skb) {

				printk(KERN_WARNING "%s: Memory squeeze, "

				       "deferring packet.\n", dev->name);

				dev->stats.rx_dropped++;
@@ -477,7 +475,7 @@ static irqreturn_t lance_interrupt (int irq, void *dev_id) 
	return IRQ_HANDLED;

}



struct net_device *last_dev = 0;

struct net_device *last_dev;



static int lance_open (struct net_device *dev)

{

drivers/net/bnx2.c

+2 −2
Original line number Diff line number Diff line
@@ -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));

	}

drivers/net/cassini.c

+1 −1
Original line number Diff line number Diff line
@@ -5085,7 +5085,7 @@ static int __devinit cas_init_one(struct pci_dev *pdev, 


	/* give us access to cassini registers */

	cp->regs = pci_iomap(pdev, 0, casreg_len);

	if (cp->regs == 0UL) {

	if (!cp->regs) {

		dev_err(&pdev->dev, "Cannot map device registers, aborting.\n");

		goto err_out_free_res;

	}