Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e45a6187 authored by david decotigny's avatar david decotigny Committed by David S. Miller
Browse files

forcedeth: fix a few sparse warnings (variable shadowing) 



This fixes the following sparse warnings:
drivers/net/ethernet/nvidia/forcedeth.c:2113:7: warning: symbol 'size' shadows an earlier one
drivers/net/ethernet/nvidia/forcedeth.c:2102:6: originally declared here
drivers/net/ethernet/nvidia/forcedeth.c:2155:7: warning: symbol 'size' shadows an earlier one
drivers/net/ethernet/nvidia/forcedeth.c:2102:6: originally declared here
drivers/net/ethernet/nvidia/forcedeth.c:2227:7: warning: symbol 'size' shadows an earlier one
drivers/net/ethernet/nvidia/forcedeth.c:2215:6: originally declared here
drivers/net/ethernet/nvidia/forcedeth.c:2271:7: warning: symbol 'size' shadows an earlier one
drivers/net/ethernet/nvidia/forcedeth.c:2215:6: originally declared here
drivers/net/ethernet/nvidia/forcedeth.c:2986:20: warning: symbol 'addr' shadows an earlier one
drivers/net/ethernet/nvidia/forcedeth.c:2963:6: originally declared here

Signed-off-by: default avatarDavid Decotigny <david.decotigny@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0bdfea8b

drivers/net/ethernet/nvidia/forcedeth.c

+17 −17
Original line number Diff line number Diff line
@@ -2103,10 +2103,10 @@ static netdev_tx_t nv_start_xmit(struct sk_buff *skb, struct net_device *dev) 


	/* add fragments to entries count */

	for (i = 0; i < fragments; i++) {

		u32 size = skb_frag_size(&skb_shinfo(skb)->frags[i]);

		u32 frag_size = skb_frag_size(&skb_shinfo(skb)->frags[i]);



		entries += (size >> NV_TX2_TSO_MAX_SHIFT) +

			   ((size & (NV_TX2_TSO_MAX_SIZE-1)) ? 1 : 0);

		entries += (frag_size >> NV_TX2_TSO_MAX_SHIFT) +

			   ((frag_size & (NV_TX2_TSO_MAX_SIZE-1)) ? 1 : 0);

	}



	spin_lock_irqsave(&np->lock, flags);
@@ -2145,13 +2145,13 @@ static netdev_tx_t nv_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	/* setup the fragments */

	for (i = 0; i < fragments; i++) {

		const skb_frag_t *frag = &skb_shinfo(skb)->frags[i];

		u32 size = skb_frag_size(frag);

		u32 frag_size = skb_frag_size(frag);

		offset = 0;



		do {

			prev_tx = put_tx;

			prev_tx_ctx = np->put_tx_ctx;

			bcnt = (size > NV_TX2_TSO_MAX_SIZE) ? NV_TX2_TSO_MAX_SIZE : size;

			bcnt = (frag_size > NV_TX2_TSO_MAX_SIZE) ? NV_TX2_TSO_MAX_SIZE : frag_size;

			np->put_tx_ctx->dma = skb_frag_dma_map(

							&np->pci_dev->dev,

							frag, offset,
@@ -2163,12 +2163,12 @@ static netdev_tx_t nv_start_xmit(struct sk_buff *skb, struct net_device *dev) 
			put_tx->flaglen = cpu_to_le32((bcnt-1) | tx_flags);



			offset += bcnt;

			size -= bcnt;

			frag_size -= bcnt;

			if (unlikely(put_tx++ == np->last_tx.orig))

				put_tx = np->first_tx.orig;

			if (unlikely(np->put_tx_ctx++ == np->last_tx_ctx))

				np->put_tx_ctx = np->first_tx_ctx;

		} while (size);

		} while (frag_size);

	}



	/* set last fragment flag  */
@@ -2217,10 +2217,10 @@ static netdev_tx_t nv_start_xmit_optimized(struct sk_buff *skb, 


	/* add fragments to entries count */

	for (i = 0; i < fragments; i++) {

		u32 size = skb_frag_size(&skb_shinfo(skb)->frags[i]);

		u32 frag_size = skb_frag_size(&skb_shinfo(skb)->frags[i]);



		entries += (size >> NV_TX2_TSO_MAX_SHIFT) +

			   ((size & (NV_TX2_TSO_MAX_SIZE-1)) ? 1 : 0);

		entries += (frag_size >> NV_TX2_TSO_MAX_SHIFT) +

			   ((frag_size & (NV_TX2_TSO_MAX_SIZE-1)) ? 1 : 0);

	}



	spin_lock_irqsave(&np->lock, flags);
@@ -2261,13 +2261,13 @@ static netdev_tx_t nv_start_xmit_optimized(struct sk_buff *skb, 
	/* setup the fragments */

	for (i = 0; i < fragments; i++) {

		skb_frag_t *frag = &skb_shinfo(skb)->frags[i];

		u32 size = skb_frag_size(frag);

		u32 frag_size = skb_frag_size(frag);

		offset = 0;



		do {

			prev_tx = put_tx;

			prev_tx_ctx = np->put_tx_ctx;

			bcnt = (size > NV_TX2_TSO_MAX_SIZE) ? NV_TX2_TSO_MAX_SIZE : size;

			bcnt = (frag_size > NV_TX2_TSO_MAX_SIZE) ? NV_TX2_TSO_MAX_SIZE : frag_size;

			np->put_tx_ctx->dma = skb_frag_dma_map(

							&np->pci_dev->dev,

							frag, offset,
@@ -2280,12 +2280,12 @@ static netdev_tx_t nv_start_xmit_optimized(struct sk_buff *skb, 
			put_tx->flaglen = cpu_to_le32((bcnt-1) | tx_flags);



			offset += bcnt;

			size -= bcnt;

			frag_size -= bcnt;

			if (unlikely(put_tx++ == np->last_tx.ex))

				put_tx = np->first_tx.ex;

			if (unlikely(np->put_tx_ctx++ == np->last_tx_ctx))

				np->put_tx_ctx = np->first_tx_ctx;

		} while (size);

		} while (frag_size);

	}



	/* set last fragment flag  */
@@ -2933,11 +2933,11 @@ static void nv_set_multicast(struct net_device *dev) 
				struct netdev_hw_addr *ha;



				netdev_for_each_mc_addr(ha, dev) {

					unsigned char *addr = ha->addr;

					unsigned char *hw_addr = ha->addr;

					u32 a, b;



					a = le32_to_cpu(*(__le32 *) addr);

					b = le16_to_cpu(*(__le16 *) (&addr[4]));

					a = le32_to_cpu(*(__le32 *) hw_addr);

					b = le16_to_cpu(*(__le16 *) (&hw_addr[4]));

					alwaysOn[0] &= a;

					alwaysOff[0] &= ~a;

					alwaysOn[1] &= b;