diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-04-25 20:40:23 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:24:30 -0400 |
commit | 4c13eb6657fe9ef7b4dc8f1a405c902e9e5234e0 (patch) | |
tree | d338fad7a61824d8c14c079c0be437ea4ad83f01 /drivers/net/pcmcia | |
parent | 029720f15dcd3c6c16824177cfc486083b229411 (diff) |
[ETH]: Make eth_type_trans set skb->dev like the other *_type_trans
One less thing for drivers writers to worry about.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/pcmcia')
-rw-r--r-- | drivers/net/pcmcia/3c574_cs.c | 1 | ||||
-rw-r--r-- | drivers/net/pcmcia/3c589_cs.c | 1 | ||||
-rw-r--r-- | drivers/net/pcmcia/axnet_cs.c | 1 | ||||
-rw-r--r-- | drivers/net/pcmcia/fmvj18x_cs.c | 1 | ||||
-rw-r--r-- | drivers/net/pcmcia/nmclan_cs.c | 2 | ||||
-rw-r--r-- | drivers/net/pcmcia/smc91c92_cs.c | 1 | ||||
-rw-r--r-- | drivers/net/pcmcia/xirc2ps_cs.c | 1 |
7 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c index c7bd9c1c7f31..2b395ee21f75 100644 --- a/drivers/net/pcmcia/3c574_cs.c +++ b/drivers/net/pcmcia/3c574_cs.c | |||
@@ -1056,7 +1056,6 @@ static int el3_rx(struct net_device *dev, int worklimit) | |||
1056 | DEBUG(3, " Receiving packet size %d status %4.4x.\n", | 1056 | DEBUG(3, " Receiving packet size %d status %4.4x.\n", |
1057 | pkt_len, rx_status); | 1057 | pkt_len, rx_status); |
1058 | if (skb != NULL) { | 1058 | if (skb != NULL) { |
1059 | skb->dev = dev; | ||
1060 | skb_reserve(skb, 2); | 1059 | skb_reserve(skb, 2); |
1061 | insl(ioaddr+RX_FIFO, skb_put(skb, pkt_len), | 1060 | insl(ioaddr+RX_FIFO, skb_put(skb, pkt_len), |
1062 | ((pkt_len+3)>>2)); | 1061 | ((pkt_len+3)>>2)); |
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c index 461e8274ef69..143ae2ff309e 100644 --- a/drivers/net/pcmcia/3c589_cs.c +++ b/drivers/net/pcmcia/3c589_cs.c | |||
@@ -883,7 +883,6 @@ static int el3_rx(struct net_device *dev) | |||
883 | DEBUG(3, " Receiving packet size %d status %4.4x.\n", | 883 | DEBUG(3, " Receiving packet size %d status %4.4x.\n", |
884 | pkt_len, rx_status); | 884 | pkt_len, rx_status); |
885 | if (skb != NULL) { | 885 | if (skb != NULL) { |
886 | skb->dev = dev; | ||
887 | skb_reserve(skb, 2); | 886 | skb_reserve(skb, 2); |
888 | insl(ioaddr+RX_FIFO, skb_put(skb, pkt_len), | 887 | insl(ioaddr+RX_FIFO, skb_put(skb, pkt_len), |
889 | (pkt_len+3)>>2); | 888 | (pkt_len+3)>>2); |
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index 6139048f8117..fabbe95c7ef1 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c | |||
@@ -1496,7 +1496,6 @@ static void ei_receive(struct net_device *dev) | |||
1496 | else | 1496 | else |
1497 | { | 1497 | { |
1498 | skb_reserve(skb,2); /* IP headers on 16 byte boundaries */ | 1498 | skb_reserve(skb,2); /* IP headers on 16 byte boundaries */ |
1499 | skb->dev = dev; | ||
1500 | skb_put(skb, pkt_len); /* Make room */ | 1499 | skb_put(skb, pkt_len); /* Make room */ |
1501 | ei_block_input(dev, pkt_len, skb, current_offset + sizeof(rx_frame)); | 1500 | ei_block_input(dev, pkt_len, skb, current_offset + sizeof(rx_frame)); |
1502 | skb->protocol=eth_type_trans(skb,dev); | 1501 | skb->protocol=eth_type_trans(skb,dev); |
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c index 0d7de617e535..3f93d4933235 100644 --- a/drivers/net/pcmcia/fmvj18x_cs.c +++ b/drivers/net/pcmcia/fmvj18x_cs.c | |||
@@ -999,7 +999,6 @@ static void fjn_rx(struct net_device *dev) | |||
999 | lp->stats.rx_dropped++; | 999 | lp->stats.rx_dropped++; |
1000 | break; | 1000 | break; |
1001 | } | 1001 | } |
1002 | skb->dev = dev; | ||
1003 | 1002 | ||
1004 | skb_reserve(skb, 2); | 1003 | skb_reserve(skb, 2); |
1005 | insw(ioaddr + DATAPORT, skb_put(skb, pkt_len), | 1004 | insw(ioaddr + DATAPORT, skb_put(skb, pkt_len), |
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c index 3b707747a811..ec0af65cd5d7 100644 --- a/drivers/net/pcmcia/nmclan_cs.c +++ b/drivers/net/pcmcia/nmclan_cs.c | |||
@@ -1182,8 +1182,6 @@ static int mace_rx(struct net_device *dev, unsigned char RxCnt) | |||
1182 | skb = dev_alloc_skb(pkt_len+2); | 1182 | skb = dev_alloc_skb(pkt_len+2); |
1183 | 1183 | ||
1184 | if (skb != NULL) { | 1184 | if (skb != NULL) { |
1185 | skb->dev = dev; | ||
1186 | |||
1187 | skb_reserve(skb, 2); | 1185 | skb_reserve(skb, 2); |
1188 | insw(ioaddr + AM2150_RCV, skb_put(skb, pkt_len), pkt_len>>1); | 1186 | insw(ioaddr + AM2150_RCV, skb_put(skb, pkt_len), pkt_len>>1); |
1189 | if (pkt_len & 1) | 1187 | if (pkt_len & 1) |
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c index 2561f76033ea..7912dbd14251 100644 --- a/drivers/net/pcmcia/smc91c92_cs.c +++ b/drivers/net/pcmcia/smc91c92_cs.c | |||
@@ -1669,7 +1669,6 @@ static void smc_rx(struct net_device *dev) | |||
1669 | (packet_length+1)>>1); | 1669 | (packet_length+1)>>1); |
1670 | skb->protocol = eth_type_trans(skb, dev); | 1670 | skb->protocol = eth_type_trans(skb, dev); |
1671 | 1671 | ||
1672 | skb->dev = dev; | ||
1673 | netif_rx(skb); | 1672 | netif_rx(skb); |
1674 | dev->last_rx = jiffies; | 1673 | dev->last_rx = jiffies; |
1675 | smc->stats.rx_packets++; | 1674 | smc->stats.rx_packets++; |
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c index 5879e7c36988..809ec440b8eb 100644 --- a/drivers/net/pcmcia/xirc2ps_cs.c +++ b/drivers/net/pcmcia/xirc2ps_cs.c | |||
@@ -1226,7 +1226,6 @@ xirc2ps_interrupt(int irq, void *dev_id) | |||
1226 | (pktlen+1)>>1); | 1226 | (pktlen+1)>>1); |
1227 | } | 1227 | } |
1228 | skb->protocol = eth_type_trans(skb, dev); | 1228 | skb->protocol = eth_type_trans(skb, dev); |
1229 | skb->dev = dev; | ||
1230 | netif_rx(skb); | 1229 | netif_rx(skb); |
1231 | dev->last_rx = jiffies; | 1230 | dev->last_rx = jiffies; |
1232 | lp->stats.rx_packets++; | 1231 | lp->stats.rx_packets++; |