diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-03-30 01:02:15 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-03-31 02:51:10 -0400 |
commit | b05b7d9563f11bf3d7b7f3f53cd74cbfab107355 (patch) | |
tree | 1d8a95ba1373a5ec8f1f591751bd8bc2dffd2229 /drivers/net | |
parent | e446630c960946b5c1762e4eadb618becef599e7 (diff) |
net: remove redundant code
eth_type_trans(skb, netdev) does the "skb->dev = netdev;"
initialization, we can remove it from various network drivers.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/arm/w90p910_ether.c | 1 | ||||
-rw-r--r-- | drivers/net/atl1c/atl1c_main.c | 1 | ||||
-rw-r--r-- | drivers/net/atl1e/atl1e_main.c | 1 | ||||
-rw-r--r-- | drivers/net/atlx/atl2.c | 1 | ||||
-rw-r--r-- | drivers/net/bcm63xx_enet.c | 1 | ||||
-rw-r--r-- | drivers/net/benet/be_main.c | 1 | ||||
-rw-r--r-- | drivers/net/fec_mpc52xx.c | 1 | ||||
-rw-r--r-- | drivers/net/greth.c | 1 | ||||
-rw-r--r-- | drivers/net/ibm_newemac/core.c | 1 | ||||
-rw-r--r-- | drivers/net/ks8851_mll.c | 1 | ||||
-rw-r--r-- | drivers/net/ksz884x.c | 2 | ||||
-rw-r--r-- | drivers/net/s6gmac.c | 1 | ||||
-rw-r--r-- | drivers/net/tehuti.c | 1 | ||||
-rw-r--r-- | drivers/net/xilinx_emaclite.c | 1 |
14 files changed, 0 insertions, 15 deletions
diff --git a/drivers/net/arm/w90p910_ether.c b/drivers/net/arm/w90p910_ether.c index febd813c916d..3302df21d591 100644 --- a/drivers/net/arm/w90p910_ether.c +++ b/drivers/net/arm/w90p910_ether.c | |||
@@ -743,7 +743,6 @@ static void netdev_rx(struct net_device *dev) | |||
743 | return; | 743 | return; |
744 | } | 744 | } |
745 | 745 | ||
746 | skb->dev = dev; | ||
747 | skb_reserve(skb, 2); | 746 | skb_reserve(skb, 2); |
748 | skb_put(skb, length); | 747 | skb_put(skb, length); |
749 | skb_copy_to_linear_data(skb, data, length); | 748 | skb_copy_to_linear_data(skb, data, length); |
diff --git a/drivers/net/atl1c/atl1c_main.c b/drivers/net/atl1c/atl1c_main.c index 50dc531a02d8..a5508e1b261b 100644 --- a/drivers/net/atl1c/atl1c_main.c +++ b/drivers/net/atl1c/atl1c_main.c | |||
@@ -1817,7 +1817,6 @@ rrs_checked: | |||
1817 | atl1c_clean_rfd(rfd_ring, rrs, rfd_num); | 1817 | atl1c_clean_rfd(rfd_ring, rrs, rfd_num); |
1818 | skb_put(skb, length - ETH_FCS_LEN); | 1818 | skb_put(skb, length - ETH_FCS_LEN); |
1819 | skb->protocol = eth_type_trans(skb, netdev); | 1819 | skb->protocol = eth_type_trans(skb, netdev); |
1820 | skb->dev = netdev; | ||
1821 | atl1c_rx_checksum(adapter, skb, rrs); | 1820 | atl1c_rx_checksum(adapter, skb, rrs); |
1822 | if (unlikely(adapter->vlgrp) && rrs->word3 & RRS_VLAN_INS) { | 1821 | if (unlikely(adapter->vlgrp) && rrs->word3 & RRS_VLAN_INS) { |
1823 | u16 vlan; | 1822 | u16 vlan; |
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c index 73302ae468aa..7231b5779122 100644 --- a/drivers/net/atl1e/atl1e_main.c +++ b/drivers/net/atl1e/atl1e_main.c | |||
@@ -1428,7 +1428,6 @@ static void atl1e_clean_rx_irq(struct atl1e_adapter *adapter, u8 que, | |||
1428 | "Memory squeeze, deferring packet\n"); | 1428 | "Memory squeeze, deferring packet\n"); |
1429 | goto skip_pkt; | 1429 | goto skip_pkt; |
1430 | } | 1430 | } |
1431 | skb->dev = netdev; | ||
1432 | memcpy(skb->data, (u8 *)(prrs + 1), packet_size); | 1431 | memcpy(skb->data, (u8 *)(prrs + 1), packet_size); |
1433 | skb_put(skb, packet_size); | 1432 | skb_put(skb, packet_size); |
1434 | skb->protocol = eth_type_trans(skb, netdev); | 1433 | skb->protocol = eth_type_trans(skb, netdev); |
diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c index 7061d7108f08..199f2c9ce749 100644 --- a/drivers/net/atlx/atl2.c +++ b/drivers/net/atlx/atl2.c | |||
@@ -421,7 +421,6 @@ static void atl2_intr_rx(struct atl2_adapter *adapter) | |||
421 | netdev->stats.rx_dropped++; | 421 | netdev->stats.rx_dropped++; |
422 | break; | 422 | break; |
423 | } | 423 | } |
424 | skb->dev = netdev; | ||
425 | memcpy(skb->data, rxd->packet, rx_size); | 424 | memcpy(skb->data, rxd->packet, rx_size); |
426 | skb_put(skb, rx_size); | 425 | skb_put(skb, rx_size); |
427 | skb->protocol = eth_type_trans(skb, netdev); | 426 | skb->protocol = eth_type_trans(skb, netdev); |
diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/bcm63xx_enet.c index 8cdcab7655c0..37eb8021de1c 100644 --- a/drivers/net/bcm63xx_enet.c +++ b/drivers/net/bcm63xx_enet.c | |||
@@ -340,7 +340,6 @@ static int bcm_enet_receive_queue(struct net_device *dev, int budget) | |||
340 | } | 340 | } |
341 | 341 | ||
342 | skb_put(skb, len); | 342 | skb_put(skb, len); |
343 | skb->dev = dev; | ||
344 | skb->protocol = eth_type_trans(skb, dev); | 343 | skb->protocol = eth_type_trans(skb, dev); |
345 | priv->stats.rx_packets++; | 344 | priv->stats.rx_packets++; |
346 | priv->stats.rx_bytes += len; | 345 | priv->stats.rx_bytes += len; |
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index 50ea0561ecc7..17282df6e202 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c | |||
@@ -826,7 +826,6 @@ static void be_rx_compl_process(struct be_adapter *adapter, | |||
826 | 826 | ||
827 | skb->truesize = skb->len + sizeof(struct sk_buff); | 827 | skb->truesize = skb->len + sizeof(struct sk_buff); |
828 | skb->protocol = eth_type_trans(skb, adapter->netdev); | 828 | skb->protocol = eth_type_trans(skb, adapter->netdev); |
829 | skb->dev = adapter->netdev; | ||
830 | 829 | ||
831 | vlanf = AMAP_GET_BITS(struct amap_eth_rx_compl, vtp, rxcp); | 830 | vlanf = AMAP_GET_BITS(struct amap_eth_rx_compl, vtp, rxcp); |
832 | vtm = AMAP_GET_BITS(struct amap_eth_rx_compl, vtm, rxcp); | 831 | vtm = AMAP_GET_BITS(struct amap_eth_rx_compl, vtm, rxcp); |
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c index 0dbd7219bbde..704155e2bdd1 100644 --- a/drivers/net/fec_mpc52xx.c +++ b/drivers/net/fec_mpc52xx.c | |||
@@ -435,7 +435,6 @@ static irqreturn_t mpc52xx_fec_rx_interrupt(int irq, void *dev_id) | |||
435 | DMA_FROM_DEVICE); | 435 | DMA_FROM_DEVICE); |
436 | length = status & BCOM_FEC_RX_BD_LEN_MASK; | 436 | length = status & BCOM_FEC_RX_BD_LEN_MASK; |
437 | skb_put(rskb, length - 4); /* length without CRC32 */ | 437 | skb_put(rskb, length - 4); /* length without CRC32 */ |
438 | rskb->dev = dev; | ||
439 | rskb->protocol = eth_type_trans(rskb, dev); | 438 | rskb->protocol = eth_type_trans(rskb, dev); |
440 | netif_rx(rskb); | 439 | netif_rx(rskb); |
441 | 440 | ||
diff --git a/drivers/net/greth.c b/drivers/net/greth.c index 2b9c1cbc9ec1..c5e0d28a6de9 100644 --- a/drivers/net/greth.c +++ b/drivers/net/greth.c | |||
@@ -894,7 +894,6 @@ static int greth_rx_gbit(struct net_device *dev, int limit) | |||
894 | else | 894 | else |
895 | skb->ip_summed = CHECKSUM_NONE; | 895 | skb->ip_summed = CHECKSUM_NONE; |
896 | 896 | ||
897 | skb->dev = dev; | ||
898 | skb->protocol = eth_type_trans(skb, dev); | 897 | skb->protocol = eth_type_trans(skb, dev); |
899 | dev->stats.rx_packets++; | 898 | dev->stats.rx_packets++; |
900 | netif_receive_skb(skb); | 899 | netif_receive_skb(skb); |
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c index fb0ac6d7c040..d8533a4ef825 100644 --- a/drivers/net/ibm_newemac/core.c +++ b/drivers/net/ibm_newemac/core.c | |||
@@ -1699,7 +1699,6 @@ static int emac_poll_rx(void *param, int budget) | |||
1699 | 1699 | ||
1700 | skb_put(skb, len); | 1700 | skb_put(skb, len); |
1701 | push_packet: | 1701 | push_packet: |
1702 | skb->dev = dev->ndev; | ||
1703 | skb->protocol = eth_type_trans(skb, dev->ndev); | 1702 | skb->protocol = eth_type_trans(skb, dev->ndev); |
1704 | emac_rx_csum(dev, skb, ctrl); | 1703 | emac_rx_csum(dev, skb, ctrl); |
1705 | 1704 | ||
diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c index d3c6a77f7ec0..ee3fe30b2ad7 100644 --- a/drivers/net/ks8851_mll.c +++ b/drivers/net/ks8851_mll.c | |||
@@ -801,7 +801,6 @@ static void ks_rcv(struct ks_net *ks, struct net_device *netdev) | |||
801 | /* read data block including CRC 4 bytes */ | 801 | /* read data block including CRC 4 bytes */ |
802 | ks_read_qmu(ks, (u16 *)skb->data, frame_hdr->len); | 802 | ks_read_qmu(ks, (u16 *)skb->data, frame_hdr->len); |
803 | skb_put(skb, frame_hdr->len); | 803 | skb_put(skb, frame_hdr->len); |
804 | skb->dev = netdev; | ||
805 | skb->protocol = eth_type_trans(skb, netdev); | 804 | skb->protocol = eth_type_trans(skb, netdev); |
806 | netif_rx(skb); | 805 | netif_rx(skb); |
807 | } else { | 806 | } else { |
diff --git a/drivers/net/ksz884x.c b/drivers/net/ksz884x.c index b47a2b3e116e..b843bf7d8c17 100644 --- a/drivers/net/ksz884x.c +++ b/drivers/net/ksz884x.c | |||
@@ -5043,8 +5043,6 @@ static inline int rx_proc(struct net_device *dev, struct ksz_hw* hw, | |||
5043 | dma_buf->skb->data, packet_len); | 5043 | dma_buf->skb->data, packet_len); |
5044 | } while (0); | 5044 | } while (0); |
5045 | 5045 | ||
5046 | skb->dev = dev; | ||
5047 | |||
5048 | skb->protocol = eth_type_trans(skb, dev); | 5046 | skb->protocol = eth_type_trans(skb, dev); |
5049 | 5047 | ||
5050 | if (hw->rx_cfg & (DMA_RX_CSUM_UDP | DMA_RX_CSUM_TCP)) | 5048 | if (hw->rx_cfg & (DMA_RX_CSUM_UDP | DMA_RX_CSUM_TCP)) |
diff --git a/drivers/net/s6gmac.c b/drivers/net/s6gmac.c index 45f26344b368..6b12524ad7c1 100644 --- a/drivers/net/s6gmac.c +++ b/drivers/net/s6gmac.c | |||
@@ -396,7 +396,6 @@ static void s6gmac_rx_interrupt(struct net_device *dev) | |||
396 | } else { | 396 | } else { |
397 | skb_put(skb, (pfx >> S6_GMAC_BURST_POSTRD_LEN) | 397 | skb_put(skb, (pfx >> S6_GMAC_BURST_POSTRD_LEN) |
398 | & S6_GMAC_BURST_POSTRD_LEN_MASK); | 398 | & S6_GMAC_BURST_POSTRD_LEN_MASK); |
399 | skb->dev = dev; | ||
400 | skb->protocol = eth_type_trans(skb, dev); | 399 | skb->protocol = eth_type_trans(skb, dev); |
401 | skb->ip_summed = CHECKSUM_UNNECESSARY; | 400 | skb->ip_summed = CHECKSUM_UNNECESSARY; |
402 | netif_rx(skb); | 401 | netif_rx(skb); |
diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c index f5493092521a..068a47174fca 100644 --- a/drivers/net/tehuti.c +++ b/drivers/net/tehuti.c | |||
@@ -1303,7 +1303,6 @@ static int bdx_rx_receive(struct bdx_priv *priv, struct rxd_fifo *f, int budget) | |||
1303 | priv->net_stats.rx_bytes += len; | 1303 | priv->net_stats.rx_bytes += len; |
1304 | 1304 | ||
1305 | skb_put(skb, len); | 1305 | skb_put(skb, len); |
1306 | skb->dev = priv->ndev; | ||
1307 | skb->ip_summed = CHECKSUM_UNNECESSARY; | 1306 | skb->ip_summed = CHECKSUM_UNNECESSARY; |
1308 | skb->protocol = eth_type_trans(skb, priv->ndev); | 1307 | skb->protocol = eth_type_trans(skb, priv->ndev); |
1309 | 1308 | ||
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c index 1a74594224b1..eaebba8df6fc 100644 --- a/drivers/net/xilinx_emaclite.c +++ b/drivers/net/xilinx_emaclite.c | |||
@@ -638,7 +638,6 @@ static void xemaclite_rx_handler(struct net_device *dev) | |||
638 | } | 638 | } |
639 | 639 | ||
640 | skb_put(skb, len); /* Tell the skb how much data we got */ | 640 | skb_put(skb, len); /* Tell the skb how much data we got */ |
641 | skb->dev = dev; /* Fill out required meta-data */ | ||
642 | 641 | ||
643 | skb->protocol = eth_type_trans(skb, dev); | 642 | skb->protocol = eth_type_trans(skb, dev); |
644 | skb->ip_summed = CHECKSUM_NONE; | 643 | skb->ip_summed = CHECKSUM_NONE; |