diff options
Diffstat (limited to 'drivers/net/sky2.c')
-rw-r--r-- | drivers/net/sky2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 36db93811ac7..68f9c206a620 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
@@ -1175,7 +1175,7 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev) | |||
1175 | /* just drop the packet if non-linear expansion fails */ | 1175 | /* just drop the packet if non-linear expansion fails */ |
1176 | if (skb_header_cloned(skb) && | 1176 | if (skb_header_cloned(skb) && |
1177 | pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) { | 1177 | pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) { |
1178 | dev_kfree_skb_any(skb); | 1178 | dev_kfree_skb(skb); |
1179 | goto out_unlock; | 1179 | goto out_unlock; |
1180 | } | 1180 | } |
1181 | 1181 | ||
@@ -1324,7 +1324,7 @@ static void sky2_tx_complete(struct sky2_port *sky2, u16 done) | |||
1324 | PCI_DMA_TODEVICE); | 1324 | PCI_DMA_TODEVICE); |
1325 | } | 1325 | } |
1326 | 1326 | ||
1327 | dev_kfree_skb_any(skb); | 1327 | dev_kfree_skb(skb); |
1328 | } | 1328 | } |
1329 | 1329 | ||
1330 | sky2->tx_cons = put; | 1330 | sky2->tx_cons = put; |
@@ -2484,7 +2484,7 @@ static const struct sky2_stat { | |||
2484 | { "single_collisions", GM_TXF_SNG_COL }, | 2484 | { "single_collisions", GM_TXF_SNG_COL }, |
2485 | { "multi_collisions", GM_TXF_MUL_COL }, | 2485 | { "multi_collisions", GM_TXF_MUL_COL }, |
2486 | 2486 | ||
2487 | { "rx_short", GM_RXE_SHT }, | 2487 | { "rx_short", GM_RXF_SHT }, |
2488 | { "rx_runt", GM_RXE_FRAG }, | 2488 | { "rx_runt", GM_RXE_FRAG }, |
2489 | { "rx_64_byte_packets", GM_RXF_64B }, | 2489 | { "rx_64_byte_packets", GM_RXF_64B }, |
2490 | { "rx_65_to_127_byte_packets", GM_RXF_127B }, | 2490 | { "rx_65_to_127_byte_packets", GM_RXF_127B }, |
@@ -2607,7 +2607,7 @@ static struct net_device_stats *sky2_get_stats(struct net_device *dev) | |||
2607 | sky2->net_stats.rx_bytes = data[1]; | 2607 | sky2->net_stats.rx_bytes = data[1]; |
2608 | sky2->net_stats.tx_packets = data[2] + data[4] + data[6]; | 2608 | sky2->net_stats.tx_packets = data[2] + data[4] + data[6]; |
2609 | sky2->net_stats.rx_packets = data[3] + data[5] + data[7]; | 2609 | sky2->net_stats.rx_packets = data[3] + data[5] + data[7]; |
2610 | sky2->net_stats.multicast = data[5] + data[7]; | 2610 | sky2->net_stats.multicast = data[3] + data[5]; |
2611 | sky2->net_stats.collisions = data[10]; | 2611 | sky2->net_stats.collisions = data[10]; |
2612 | sky2->net_stats.tx_aborted_errors = data[12]; | 2612 | sky2->net_stats.tx_aborted_errors = data[12]; |
2613 | 2613 | ||