diff options
Diffstat (limited to 'drivers/net/ethernet/freescale/gianfar.c')
-rw-r--r-- | drivers/net/ethernet/freescale/gianfar.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c index f5c87bd35fa1..f27f9bae1a4a 100644 --- a/drivers/net/ethernet/freescale/gianfar.c +++ b/drivers/net/ethernet/freescale/gianfar.c | |||
@@ -3063,9 +3063,6 @@ static void gfar_process_frame(struct net_device *ndev, struct sk_buff *skb) | |||
3063 | if (ndev->features & NETIF_F_RXCSUM) | 3063 | if (ndev->features & NETIF_F_RXCSUM) |
3064 | gfar_rx_checksum(skb, fcb); | 3064 | gfar_rx_checksum(skb, fcb); |
3065 | 3065 | ||
3066 | /* Tell the skb what kind of packet this is */ | ||
3067 | skb->protocol = eth_type_trans(skb, ndev); | ||
3068 | |||
3069 | /* There's need to check for NETIF_F_HW_VLAN_CTAG_RX here. | 3066 | /* There's need to check for NETIF_F_HW_VLAN_CTAG_RX here. |
3070 | * Even if vlan rx accel is disabled, on some chips | 3067 | * Even if vlan rx accel is disabled, on some chips |
3071 | * RXFCB_VLN is pseudo randomly set. | 3068 | * RXFCB_VLN is pseudo randomly set. |
@@ -3136,13 +3133,15 @@ int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit) | |||
3136 | continue; | 3133 | continue; |
3137 | } | 3134 | } |
3138 | 3135 | ||
3136 | gfar_process_frame(ndev, skb); | ||
3137 | |||
3139 | /* Increment the number of packets */ | 3138 | /* Increment the number of packets */ |
3140 | total_pkts++; | 3139 | total_pkts++; |
3141 | total_bytes += skb->len; | 3140 | total_bytes += skb->len; |
3142 | 3141 | ||
3143 | skb_record_rx_queue(skb, rx_queue->qindex); | 3142 | skb_record_rx_queue(skb, rx_queue->qindex); |
3144 | 3143 | ||
3145 | gfar_process_frame(ndev, skb); | 3144 | skb->protocol = eth_type_trans(skb, ndev); |
3146 | 3145 | ||
3147 | /* Send the packet up the stack */ | 3146 | /* Send the packet up the stack */ |
3148 | napi_gro_receive(&rx_queue->grp->napi_rx, skb); | 3147 | napi_gro_receive(&rx_queue->grp->napi_rx, skb); |