diff options
author | Jon Mason <jdmason@kudzu.us> | 2012-07-09 10:09:34 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-07-11 02:24:57 -0400 |
commit | d233d70771326769838cc4689ba034631558c6c3 (patch) | |
tree | 95ee607dfb75c1c3875241567ffbabe6f8ef7957 | |
parent | 8505120e5af625ab463a603228a3afbdd283ac31 (diff) |
sunhme: remove unnecessary setting of skb->dev
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/sun/sunhme.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c index dfc00c4683e5..73f341b8befb 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) | |||
1249 | static void happy_meal_init_rings(struct happy_meal *hp) | 1249 | static void happy_meal_init_rings(struct happy_meal *hp) |
1250 | { | 1250 | { |
1251 | struct hmeal_init_block *hb = hp->happy_block; | 1251 | struct hmeal_init_block *hb = hp->happy_block; |
1252 | struct net_device *dev = hp->dev; | ||
1253 | int i; | 1252 | int i; |
1254 | 1253 | ||
1255 | HMD(("happy_meal_init_rings: counters to zero, ")); | 1254 | HMD(("happy_meal_init_rings: counters to zero, ")); |
@@ -1270,7 +1269,6 @@ static void happy_meal_init_rings(struct happy_meal *hp) | |||
1270 | continue; | 1269 | continue; |
1271 | } | 1270 | } |
1272 | hp->rx_skbs[i] = skb; | 1271 | hp->rx_skbs[i] = skb; |
1273 | skb->dev = dev; | ||
1274 | 1272 | ||
1275 | /* Because we reserve afterwards. */ | 1273 | /* Because we reserve afterwards. */ |
1276 | skb_put(skb, (ETH_FRAME_LEN + RX_OFFSET + 4)); | 1274 | 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) | |||
2031 | } | 2029 | } |
2032 | dma_unmap_single(hp->dma_dev, dma_addr, RX_BUF_ALLOC_SIZE, DMA_FROM_DEVICE); | 2030 | dma_unmap_single(hp->dma_dev, dma_addr, RX_BUF_ALLOC_SIZE, DMA_FROM_DEVICE); |
2033 | hp->rx_skbs[elem] = new_skb; | 2031 | hp->rx_skbs[elem] = new_skb; |
2034 | new_skb->dev = dev; | ||
2035 | skb_put(new_skb, (ETH_FRAME_LEN + RX_OFFSET + 4)); | 2032 | skb_put(new_skb, (ETH_FRAME_LEN + RX_OFFSET + 4)); |
2036 | hme_write_rxd(hp, this, | 2033 | hme_write_rxd(hp, this, |
2037 | (RXFLAG_OWN|((RX_BUF_ALLOC_SIZE-RX_OFFSET)<<16)), | 2034 | (RXFLAG_OWN|((RX_BUF_ALLOC_SIZE-RX_OFFSET)<<16)), |