diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-08-17 14:13:53 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-08-17 14:13:53 +1000 |
| commit | 4eebf60b7452fbd551fd7dece855ba7825a49cbc (patch) | |
| tree | 490b4d194ba09c90e10201ab7fc084a0bda0ed27 /drivers/net/can/flexcan.c | |
| parent | 8f9cb50789e76f3e224e8861adf650e55c747af4 (diff) | |
| parent | 2c6625cd545bdd66acff14f3394865d43920a5c7 (diff) | |
| download | linux-stable-4eebf60b7452fbd551fd7dece855ba7825a49cbc.tar.gz linux-stable-4eebf60b7452fbd551fd7dece855ba7825a49cbc.tar.bz2 linux-stable-4eebf60b7452fbd551fd7dece855ba7825a49cbc.zip | |
Merge tag 'v4.2-rc7' into drm-next
Linux 4.2-rc7
Backmerge master for i915 fixes
Diffstat (limited to 'drivers/net/can/flexcan.c')
| -rw-r--r-- | drivers/net/can/flexcan.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index 6201c5a1a884..b1e8d729851c 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -577,10 +577,10 @@ static int flexcan_poll_bus_err(struct net_device *dev, u32 reg_esr) return 0; do_bus_err(dev, cf, reg_esr); - netif_receive_skb(skb); dev->stats.rx_packets++; dev->stats.rx_bytes += cf->can_dlc; + netif_receive_skb(skb); return 1; } @@ -622,10 +622,9 @@ static int flexcan_poll_state(struct net_device *dev, u32 reg_esr) if (unlikely(new_state == CAN_STATE_BUS_OFF)) can_bus_off(dev); - netif_receive_skb(skb); - dev->stats.rx_packets++; dev->stats.rx_bytes += cf->can_dlc; + netif_receive_skb(skb); return 1; } @@ -670,10 +669,10 @@ static int flexcan_read_frame(struct net_device *dev) } flexcan_read_fifo(dev, cf); - netif_receive_skb(skb); stats->rx_packets++; stats->rx_bytes += cf->can_dlc; + netif_receive_skb(skb); can_led_event(dev, CAN_LED_EVENT_RX); |