diff options
Diffstat (limited to 'drivers/ieee1394/eth1394.c')
-rw-r--r-- | drivers/ieee1394/eth1394.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c index 7aa0bf3e1028..b166b3575fa6 100644 --- a/drivers/ieee1394/eth1394.c +++ b/drivers/ieee1394/eth1394.c | |||
@@ -1220,23 +1220,19 @@ static int ether1394_data_handler(struct net_device *dev, int srcid, int destid, | |||
1220 | priv->stats.rx_errors++; | 1220 | priv->stats.rx_errors++; |
1221 | priv->stats.rx_dropped++; | 1221 | priv->stats.rx_dropped++; |
1222 | dev_kfree_skb_any(skb); | 1222 | dev_kfree_skb_any(skb); |
1223 | goto bad_proto; | 1223 | } else if (netif_rx(skb) == NET_RX_DROP) { |
1224 | } | ||
1225 | |||
1226 | if (netif_rx(skb) == NET_RX_DROP) { | ||
1227 | priv->stats.rx_errors++; | 1224 | priv->stats.rx_errors++; |
1228 | priv->stats.rx_dropped++; | 1225 | priv->stats.rx_dropped++; |
1229 | goto bad_proto; | 1226 | } else { |
1227 | priv->stats.rx_packets++; | ||
1228 | priv->stats.rx_bytes += skb->len; | ||
1230 | } | 1229 | } |
1231 | 1230 | ||
1232 | /* Statistics */ | 1231 | spin_unlock_irqrestore(&priv->lock, flags); |
1233 | priv->stats.rx_packets++; | ||
1234 | priv->stats.rx_bytes += skb->len; | ||
1235 | 1232 | ||
1236 | bad_proto: | 1233 | bad_proto: |
1237 | if (netif_queue_stopped(dev)) | 1234 | if (netif_queue_stopped(dev)) |
1238 | netif_wake_queue(dev); | 1235 | netif_wake_queue(dev); |
1239 | spin_unlock_irqrestore(&priv->lock, flags); | ||
1240 | 1236 | ||
1241 | dev->last_rx = jiffies; | 1237 | dev->last_rx = jiffies; |
1242 | 1238 | ||