Skip to content

Commit 4d7634e

Browse files
marckleinebuddeNipaLocal
authored andcommitted
net: fec: fec_enet_rx_queue(): reduce scope of data
In order to clean up of the VLAN handling, reduce the scope of data. Reviewed-by: Frank Li <[email protected]> Reviewed-by: Wei Fang <[email protected]> Signed-off-by: Marc Kleine-Budde <[email protected]> Signed-off-by: NipaLocal <nipa@local>
1 parent 4c89a8e commit 4d7634e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/net/ethernet/freescale/fec_main.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1720,7 +1720,6 @@ fec_enet_rx_queue(struct net_device *ndev, u16 queue_id, int budget)
17201720
unsigned short status;
17211721
struct sk_buff *skb;
17221722
ushort pkt_len;
1723-
__u8 *data;
17241723
int pkt_received = 0;
17251724
struct bufdesc_ex *ebdp = NULL;
17261725
bool vlan_packet_rcvd = false;
@@ -1843,10 +1842,11 @@ fec_enet_rx_queue(struct net_device *ndev, u16 queue_id, int budget)
18431842
skb_mark_for_recycle(skb);
18441843

18451844
if (unlikely(need_swap)) {
1845+
u8 *data;
1846+
18461847
data = page_address(page) + FEC_ENET_XDP_HEADROOM;
18471848
swap_buffer(data, pkt_len);
18481849
}
1849-
data = skb->data;
18501850

18511851
/* Extract the enhanced buffer descriptor */
18521852
ebdp = NULL;
@@ -1864,7 +1864,7 @@ fec_enet_rx_queue(struct net_device *ndev, u16 queue_id, int budget)
18641864

18651865
vlan_packet_rcvd = true;
18661866

1867-
memmove(skb->data + VLAN_HLEN, data, ETH_ALEN * 2);
1867+
memmove(skb->data + VLAN_HLEN, skb->data, ETH_ALEN * 2);
18681868
skb_pull(skb, VLAN_HLEN);
18691869
}
18701870

0 commit comments

Comments
 (0)