Commit 2ed2c5f0 authored by Horatiu Vultur's avatar Horatiu Vultur Committed by David S. Miller
Browse files

net: ocelot: Remove ocelot_xfh_get_cpuq 



Now when extracting frames from CPU the cpuq is not used anymore so
remove it.

Signed-off-by: default avatarHoratiu Vultur <horatiu.vultur@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7c588c3e

drivers/net/ethernet/mscc/ocelot.c

+1 −2
Original line number Diff line number Diff line
@@ -687,7 +687,7 @@ static int ocelot_xtr_poll_xfh(struct ocelot *ocelot, int grp, u32 *xfh) 
int ocelot_xtr_poll_frame(struct ocelot *ocelot, int grp, struct sk_buff **nskb)

{

	struct skb_shared_hwtstamps *shhwtstamps;

	u64 tod_in_ns, full_ts_in_ns, cpuq;

	u64 tod_in_ns, full_ts_in_ns;

	u64 timestamp, src_port, len;

	u32 xfh[OCELOT_TAG_LEN / 4];

	struct net_device *dev;
@@ -704,7 +704,6 @@ int ocelot_xtr_poll_frame(struct ocelot *ocelot, int grp, struct sk_buff **nskb) 
	ocelot_xfh_get_src_port(xfh, &src_port);

	ocelot_xfh_get_len(xfh, &len);

	ocelot_xfh_get_rew_val(xfh, &timestamp);

	ocelot_xfh_get_cpuq(xfh, &cpuq);



	if (WARN_ON(src_port >= ocelot->num_phys_ports))

		return -EINVAL;

include/linux/dsa/ocelot.h

+0 −5
Original line number Diff line number Diff line
@@ -160,11 +160,6 @@ static inline void ocelot_xfh_get_src_port(void *extraction, u64 *src_port) 
	packing(extraction, src_port, 46, 43, OCELOT_TAG_LEN, UNPACK, 0);

}



static inline void ocelot_xfh_get_cpuq(void *extraction, u64 *cpuq)

{

	packing(extraction, cpuq, 28, 20, OCELOT_TAG_LEN, UNPACK, 0);

}



static inline void ocelot_xfh_get_qos_class(void *extraction, u64 *qos_class)

{

	packing(extraction, qos_class, 19, 17, OCELOT_TAG_LEN, UNPACK, 0);

net/dsa/tag_ocelot.c

+0 −2
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ static struct sk_buff *ocelot_rcv(struct sk_buff *skb, 
	struct dsa_port *dp;

	u8 *extraction;

	u16 vlan_tpid;

	u64 cpuq;



	/* Revert skb->data by the amount consumed by the DSA master,

	 * so it points to the beginning of the frame.
@@ -113,7 +112,6 @@ static struct sk_buff *ocelot_rcv(struct sk_buff *skb, 
	ocelot_xfh_get_qos_class(extraction, &qos_class);

	ocelot_xfh_get_tag_type(extraction, &tag_type);

	ocelot_xfh_get_vlan_tci(extraction, &vlan_tci);

	ocelot_xfh_get_cpuq(extraction, &cpuq);



	skb->dev = dsa_master_find_slave(netdev, 0, src_port);

	if (!skb->dev)