[PATCH 01/11] lance: remove unnecessary setting of skb->dev

Subsystems: networking drivers, the rest

STALE5143d

15 messages, 4 authors, 2012-07-13 · open the first message on its own page

[PATCH 01/11] lance: remove unnecessary setting of skb->dev

From: Jon Mason <jdmason@kudzu.us>
Date: 2012-07-10 00:09:03

skb->dev is being unnecessarily set during ring init.  It is already being set
to the proper value when eth_type_trans is called on packet receive, and the
skb->dev is not referenced anywhere else in the code.

Signed-off-by: Jon Mason <jdmason@kudzu.us>
---
 drivers/net/ethernet/amd/lance.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/amd/lance.c b/drivers/net/ethernet/amd/lance.c
index a6e2e84..5c72843 100644
--- a/drivers/net/ethernet/amd/lance.c
+++ b/drivers/net/ethernet/amd/lance.c

@@ -873,10 +873,9 @@ lance_init_ring(struct net_device *dev, gfp_t gfp)
 
 		skb = alloc_skb(PKT_BUF_SZ, GFP_DMA | gfp);
 		lp->rx_skbuff[i] = skb;
-		if (skb) {
-			skb->dev = dev;
+		if (skb)
 			rx_buff = skb->data;
-		} else
+		else
 			rx_buff = kmalloc(PKT_BUF_SZ, GFP_DMA | gfp);
 		if (rx_buff == NULL)
 			lp->rx_ring[i].base = 0;

-- 
1.7.9.5

[PATCH 02/11] enic: remove unnecessary setting of skb->dev

From: Jon Mason <jdmason@kudzu.us>
Date: 2012-07-10 00:09:08

skb->dev is being unnecessarily set after calling eth_type_trans.
eth_type_trans already sets skb->dev to the proper value, thus making this
unnecessary.

Signed-off-by: Jon Mason <jdmason@kudzu.us>
Cc: Christian Benvenuti <redacted>
Cc: Roopa Prabhu <redacted>
Cc: Neel Patel <redacted>
Cc: Nishank Trivedi <redacted>
---
 drivers/net/ethernet/cisco/enic/enic_main.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
index 8132c78..ad1468b 100644
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c

@@ -1300,8 +1300,6 @@ static void enic_rq_indicate_buf(struct vnic_rq *rq,
 			skb->ip_summed = CHECKSUM_COMPLETE;
 		}
 
-		skb->dev = netdev;
-
 		if (vlan_stripped)
 			__vlan_hwaccel_put_tag(skb, vlan_tci);

-- 
1.7.9.5

[PATCH 03/11] netxen: remove unnecessary setting of skb->dev

From: Jon Mason <jdmason@kudzu.us>
Date: 2012-07-10 00:09:13

skb->dev is being unnecessarily set by the driver on packet recieve.
eth_type_trans already sets skb->dev to the proper value and it is not
referenced anywhere else in the dirver, thus making its setting unnecessary.

Signed-off-by: Jon Mason <jdmason@kudzu.us>
Cc: Sony Chacko <redacted>
Cc: Rajesh Borundia <redacted>
---
 .../net/ethernet/qlogic/netxen/netxen_nic_init.c   |    2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
index 8694124..b2c1b676 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c

@@ -1532,8 +1532,6 @@ static struct sk_buff *netxen_process_rxbuf(struct netxen_adapter *adapter,
 	} else
 		skb->ip_summed = CHECKSUM_NONE;
 
-	skb->dev = adapter->netdev;
-
 	buffer->skb = NULL;
 no_skb:
 	buffer->state = NETXEN_BUFFER_FREE;

-- 
1.7.9.5

[PATCH 04/11] lantiq_etop: remove unnecessary setting of skb->dev

From: Jon Mason <jdmason@kudzu.us>
Date: 2012-07-10 00:09:19

skb->dev is being unnecessarily set before calling eth_type_trans.
eth_type_trans already sets skb->dev to the proper value, thus making this
unnecessary.

Signed-off-by: Jon Mason <jdmason@kudzu.us>
---
 drivers/net/ethernet/lantiq_etop.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
index 5dc9cbd..9fa39eb 100644
--- a/drivers/net/ethernet/lantiq_etop.c
+++ b/drivers/net/ethernet/lantiq_etop.c

@@ -149,7 +149,6 @@ ltq_etop_hw_receive(struct ltq_etop_chan *ch)
 	spin_unlock_irqrestore(&priv->lock, flags);
 
 	skb_put(skb, len);
-	skb->dev = ch->netdev;
 	skb->protocol = eth_type_trans(skb, ch->netdev);
 	netif_receive_skb(skb);
 }

-- 
1.7.9.5

[PATCH 05/11] ksz884x: remove unnecessary setting of skb->dev

From: Jon Mason <jdmason@kudzu.us>
Date: 2012-07-10 00:09:24

skb->dev is being unnecessarily set during ring init.  It is already being set
to the proper value when eth_type_trans is called on packet receive, and the
skb->dev is not referenced anywhere else in the code.

Signed-off-by: Jon Mason <jdmason@kudzu.us>
---
 drivers/net/ethernet/micrel/ksz884x.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c
index eaf9ff0..2b59e39 100644
--- a/drivers/net/ethernet/micrel/ksz884x.c
+++ b/drivers/net/ethernet/micrel/ksz884x.c

@@ -4480,14 +4480,12 @@ static void ksz_init_rx_buffers(struct dev_info *adapter)
 		dma_buf->len = adapter->mtu;
 		if (!dma_buf->skb)
 			dma_buf->skb = alloc_skb(dma_buf->len, GFP_ATOMIC);
-		if (dma_buf->skb && !dma_buf->dma) {
-			dma_buf->skb->dev = adapter->dev;
+		if (dma_buf->skb && !dma_buf->dma)
 			dma_buf->dma = pci_map_single(
 				adapter->pdev,
 				skb_tail_pointer(dma_buf->skb),
 				dma_buf->len,
 				PCI_DMA_FROMDEVICE);
-		}
 
 		/* Set descriptor. */
 		set_rx_buf(desc, dma_buf->dma);

-- 
1.7.9.5

[PATCH 06/11] qlcnic: remove unnecessary setting of skb->dev

From: Jon Mason <jdmason@kudzu.us>
Date: 2012-07-10 00:09:29

skb->dev is being unnecessarily set before calling eth_type_trans.
eth_type_trans already sets skb->dev to the proper value, thus making this
unnecessary.

Signed-off-by: Jon Mason <jdmason@kudzu.us>
Cc: Anirban Chakraborty <redacted>
Cc: Sony Chacko <redacted>
Cc: linux-driver@qlogic.com
---
 drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
index 8620b69..0bcda9c 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c

@@ -1488,8 +1488,6 @@ static struct sk_buff *qlcnic_process_rxbuf(struct qlcnic_adapter *adapter,
 		skb_checksum_none_assert(skb);
 	}
 
-	skb->dev = adapter->netdev;
-
 	buffer->skb = NULL;
 
 	return skb;

-- 
1.7.9.5

[PATCH 07/11] qlge: remove unnecessary setting of skb->dev

From: Jon Mason <jdmason@kudzu.us>
Date: 2012-07-10 00:09:34

skb->dev is being unnecessarily set by the driver on packet recieve.
eth_type_trans already sets skb->dev to the proper value and it is not
referenced anywhere else in the dirver, thus making its setting unnecessary.

Signed-off-by: Jon Mason <jdmason@kudzu.us>
Cc: Anirban Chakraborty <redacted>
Cc: Jitendra Kalsaria <redacted>
Cc: Ron Mercer <redacted>
Cc: linux-driver@qlogic.com
---
 drivers/net/ethernet/qlogic/qlge/qlge_main.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
index 3c3499d..ca427eb 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c

@@ -1619,7 +1619,6 @@ static void ql_process_mac_rx_skb(struct ql_adapter *qdev,
 	}
 
 	prefetch(skb->data);
-	skb->dev = ndev;
 	if (ib_mac_rsp->flags1 & IB_MAC_IOCB_RSP_M_MASK) {
 		netif_printk(qdev, rx_status, KERN_DEBUG, qdev->ndev,
 			     "%s Multicast.\n",

@@ -1934,7 +1933,6 @@ static void ql_process_mac_split_rx_intr(struct ql_adapter *qdev,
 	}
 
 	prefetch(skb->data);
-	skb->dev = ndev;
 	if (ib_mac_rsp->flags1 & IB_MAC_IOCB_RSP_M_MASK) {
 		netif_printk(qdev, rx_status, KERN_DEBUG, qdev->ndev, "%s Multicast.\n",
 			     (ib_mac_rsp->flags1 & IB_MAC_IOCB_RSP_M_MASK) ==

-- 
1.7.9.5

[PATCH 08/11] sunbmac: remove unnecessary setting of skb->dev

From: Jon Mason <jdmason@kudzu.us>
Date: 2012-07-10 00:09:39

skb->dev is being unnecessarily set during ring init and skb alloc in rx.  It is
already being set to the proper value when eth_type_trans is called on packet
receive, and the skb->dev is not referenced anywhere else in the code.

Signed-off-by: Jon Mason <jdmason@kudzu.us>
---
 drivers/net/ethernet/sun/sunbmac.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/ethernet/sun/sunbmac.c b/drivers/net/ethernet/sun/sunbmac.c
index 2a83fc5..967fe8c 100644
--- a/drivers/net/ethernet/sun/sunbmac.c
+++ b/drivers/net/ethernet/sun/sunbmac.c

@@ -233,7 +233,6 @@ static void bigmac_init_rings(struct bigmac *bp, int from_irq)
 			continue;
 
 		bp->rx_skbs[i] = skb;
-		skb->dev = dev;
 
 		/* Because we reserve afterwards. */
 		skb_put(skb, ETH_FRAME_LEN);

@@ -838,7 +837,6 @@ static void bigmac_rx(struct bigmac *bp)
 					 RX_BUF_ALLOC_SIZE - 34,
 					 DMA_FROM_DEVICE);
 			bp->rx_skbs[elem] = new_skb;
-			new_skb->dev = bp->dev;
 			skb_put(new_skb, ETH_FRAME_LEN);
 			skb_reserve(new_skb, 34);
 			this->rx_addr =

-- 
1.7.9.5

[PATCH 09/11] sungem: remove unnecessary setting of skb->dev

From: Jon Mason <jdmason@kudzu.us>
Date: 2012-07-10 00:09:44

skb->dev is being unnecessarily set by the driver's skb alloc routine (which is
called in init and during rx).  It is already being set to the proper value when
eth_type_trans is called on packet receive, and the skb->dev is not referenced
anywhere else in the code.

Signed-off-by: Jon Mason <jdmason@kudzu.us>
---
 drivers/net/ethernet/sun/sungem.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c
index 3cf4ab7..9ae12d0 100644
--- a/drivers/net/ethernet/sun/sungem.c
+++ b/drivers/net/ethernet/sun/sungem.c

@@ -752,7 +752,6 @@ static __inline__ struct sk_buff *gem_alloc_skb(struct net_device *dev, int size
 	if (likely(skb)) {
 		unsigned long offset = ALIGNED_RX_SKB_ADDR(skb->data);
 		skb_reserve(skb, offset);
-		skb->dev = dev;
 	}
 	return skb;
 }

-- 
1.7.9.5

[PATCH 10/11] sunhme: remove unnecessary setting of skb->dev

From: Jon Mason <jdmason@kudzu.us>
Date: 2012-07-10 00:09:50

skb->dev is being unnecessarily set during ring init and skb alloc in rx.  It is
already being set to the proper value when eth_type_trans is called on packet
receive, and the skb->dev is not referenced anywhere else in the code.

Signed-off-by: Jon Mason <jdmason@kudzu.us>
---
 drivers/net/ethernet/sun/sunhme.c |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c
index dfc00c4..73f341b 100644
--- a/drivers/net/ethernet/sun/sunhme.c
+++ b/drivers/net/ethernet/sun/sunhme.c

@@ -1249,7 +1249,6 @@ static void happy_meal_clean_rings(struct happy_meal *hp)
 static void happy_meal_init_rings(struct happy_meal *hp)
 {
 	struct hmeal_init_block *hb = hp->happy_block;
-	struct net_device *dev = hp->dev;
 	int i;
 
 	HMD(("happy_meal_init_rings: counters to zero, "));

@@ -1270,7 +1269,6 @@ static void happy_meal_init_rings(struct happy_meal *hp)
 			continue;
 		}
 		hp->rx_skbs[i] = skb;
-		skb->dev = dev;
 
 		/* Because we reserve afterwards. */
 		skb_put(skb, (ETH_FRAME_LEN + RX_OFFSET + 4));

@@ -2031,7 +2029,6 @@ static void happy_meal_rx(struct happy_meal *hp, struct net_device *dev)
 			}
 			dma_unmap_single(hp->dma_dev, dma_addr, RX_BUF_ALLOC_SIZE, DMA_FROM_DEVICE);
 			hp->rx_skbs[elem] = new_skb;
-			new_skb->dev = dev;
 			skb_put(new_skb, (ETH_FRAME_LEN + RX_OFFSET + 4));
 			hme_write_rxd(hp, this,
 				      (RXFLAG_OWN|((RX_BUF_ALLOC_SIZE-RX_OFFSET)<<16)),

-- 
1.7.9.5

[PATCH 11/11] ll_temac: remove unnecessary setting of skb->dev

From: Jon Mason <jdmason@kudzu.us>
Date: 2012-07-10 00:09:54

skb->dev is being unnecessarily set by the driver on packet recieve.
eth_type_trans already sets skb->dev to the proper value and it is not
referenced anywhere else in the dirver, thus making its setting unnecessary.

Signed-off-by: Jon Mason <jdmason@kudzu.us>
---
 drivers/net/ethernet/xilinx/ll_temac_main.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index 1eaf712..705146d 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c

@@ -768,7 +768,6 @@ static void ll_temac_recv(struct net_device *ndev)
 				 DMA_FROM_DEVICE);
 
 		skb_put(skb, length);
-		skb->dev = ndev;
 		skb->protocol = eth_type_trans(skb, ndev);
 		skb_checksum_none_assert(skb);

-- 
1.7.9.5

Re: [PATCH 01/11] lance: remove unnecessary setting of skb->dev

From: David Miller <davem@davemloft.net>
Date: 2012-07-11 06:18:41

All 11 patches applied, thanks.

Re: [PATCH 02/11] enic: remove unnecessary setting of skb->dev

From: Jon Mason <jdmason@kudzu.us>
Date: 2012-07-12 21:19:18

On Mon, Jul 9, 2012 at 5:09 PM, Jon Mason [off-list ref] wrote:

skb->dev is being unnecessarily set after calling eth_type_trans.
eth_type_trans already sets skb->dev to the proper value, thus making this
unnecessary.

Signed-off-by: Jon Mason <jdmason@kudzu.us>
Cc: Christian Benvenuti <redacted>
Cc: Roopa Prabhu <redacted>

This address bounced.  Anyone know of an updated address for Roopa or
should they be removed from the MAINTAINERS list?

quoted hunk

Cc: Neel Patel <redacted>
Cc: Nishank Trivedi <redacted>
---
 drivers/net/ethernet/cisco/enic/enic_main.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
index 8132c78..ad1468b 100644
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c

@@ -1300,8 +1300,6 @@ static void enic_rq_indicate_buf(struct vnic_rq *rq,
                        skb->ip_summed = CHECKSUM_COMPLETE;
                }

-               skb->dev = netdev;
-
                if (vlan_stripped)
                        __vlan_hwaccel_put_tag(skb, vlan_tci);

--

1.7.9.5

RE: [PATCH 02/11] enic: remove unnecessary setting of skb->dev

From: Christian Benvenuti (benve) <hidden>
Date: 2012-07-12 21:33:04

Jon,
  Roopa is not in the maintainer list anymore.
Sorry about that.
We will update MAINTAINERS. 

BTW, the change in enic_main.c looks good.

/Chris

-----Original Message-----
From: Jon Mason [mailto:jdmason@kudzu.us]
Sent: Thursday, July 12, 2012 2:19 PM
To: David S. Miller
Cc: netdev@vger.kernel.org; Christian Benvenuti (benve); Neel Patel (neepatel); Nishank Trivedi
(nistrive)
Subject: Re: [PATCH 02/11] enic: remove unnecessary setting of skb->dev

On Mon, Jul 9, 2012 at 5:09 PM, Jon Mason [off-list ref] wrote:

quoted

skb->dev is being unnecessarily set after calling eth_type_trans.
eth_type_trans already sets skb->dev to the proper value, thus making this
unnecessary.

Signed-off-by: Jon Mason <jdmason@kudzu.us>
Cc: Christian Benvenuti <redacted>
Cc: Roopa Prabhu <redacted>

This address bounced.  Anyone know of an updated address for Roopa or
should they be removed from the MAINTAINERS list?

quoted

Cc: Neel Patel <redacted>
Cc: Nishank Trivedi <redacted>
---
 drivers/net/ethernet/cisco/enic/enic_main.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c

b/drivers/net/ethernet/cisco/enic/enic_main.c

quoted

index 8132c78..ad1468b 100644

--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c

@@ -1300,8 +1300,6 @@ static void enic_rq_indicate_buf(struct vnic_rq *rq,
                        skb->ip_summed = CHECKSUM_COMPLETE;
                }

-               skb->dev = netdev;
-
                if (vlan_stripped)
                        __vlan_hwaccel_put_tag(skb, vlan_tci);

--

1.7.9.5

RE: [PATCH 02/11] enic: remove unnecessary setting of skb->dev

From: Neel Patel (neepatel) <hidden>
Date: 2012-07-13 05:06:07

Jon,
The change in enic_main.c looks good.
_ Neel

-----Original Message-----
From: Christian Benvenuti (benve) 
Sent: Thursday, July 12, 2012 2:23 PM
To: Jon Mason; David S. Miller
Cc: netdev@vger.kernel.org; Neel Patel (neepatel); Nishank Trivedi (nistrive)
Subject: RE: [PATCH 02/11] enic: remove unnecessary setting of skb->dev

Jon,
  Roopa is not in the maintainer list anymore.
Sorry about that.
We will update MAINTAINERS. 

BTW, the change in enic_main.c looks good.

/Chris

-----Original Message-----
From: Jon Mason [mailto:jdmason@kudzu.us]
Sent: Thursday, July 12, 2012 2:19 PM
To: David S. Miller
Cc: netdev@vger.kernel.org; Christian Benvenuti (benve); Neel Patel 
(neepatel); Nishank Trivedi
(nistrive)
Subject: Re: [PATCH 02/11] enic: remove unnecessary setting of 
skb->dev

On Mon, Jul 9, 2012 at 5:09 PM, Jon Mason [off-list ref] wrote:

quoted

skb->dev is being unnecessarily set after calling eth_type_trans.
eth_type_trans already sets skb->dev to the proper value, thus 
making this unnecessary.

Signed-off-by: Jon Mason <jdmason@kudzu.us>
Cc: Christian Benvenuti <redacted>
Cc: Roopa Prabhu <redacted>

This address bounced.  Anyone know of an updated address for Roopa or 
should they be removed from the MAINTAINERS list?

quoted

Cc: Neel Patel <redacted>
Cc: Nishank Trivedi <redacted>
---
 drivers/net/ethernet/cisco/enic/enic_main.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c

b/drivers/net/ethernet/cisco/enic/enic_main.c

quoted

index 8132c78..ad1468b 100644

--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c

@@ -1300,8 +1300,6 @@ static void enic_rq_indicate_buf(struct vnic_rq *rq,
                        skb->ip_summed = CHECKSUM_COMPLETE;
                }

-               skb->dev = netdev;
-
                if (vlan_stripped)
                        __vlan_hwaccel_put_tag(skb, vlan_tci);

--

1.7.9.5

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help