Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Horatiu Vultur <horatiu.vultur@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Horatiu Vultur and committed by
David S. Miller
2ed2c5f0 7c588c3e

+1 -9
+1 -2
drivers/net/ethernet/mscc/ocelot.c
··· 687 687 int ocelot_xtr_poll_frame(struct ocelot *ocelot, int grp, struct sk_buff **nskb) 688 688 { 689 689 struct skb_shared_hwtstamps *shhwtstamps; 690 - u64 tod_in_ns, full_ts_in_ns, cpuq; 690 + u64 tod_in_ns, full_ts_in_ns; 691 691 u64 timestamp, src_port, len; 692 692 u32 xfh[OCELOT_TAG_LEN / 4]; 693 693 struct net_device *dev; ··· 704 704 ocelot_xfh_get_src_port(xfh, &src_port); 705 705 ocelot_xfh_get_len(xfh, &len); 706 706 ocelot_xfh_get_rew_val(xfh, &timestamp); 707 - ocelot_xfh_get_cpuq(xfh, &cpuq); 708 707 709 708 if (WARN_ON(src_port >= ocelot->num_phys_ports)) 710 709 return -EINVAL;
-5
include/linux/dsa/ocelot.h
··· 160 160 packing(extraction, src_port, 46, 43, OCELOT_TAG_LEN, UNPACK, 0); 161 161 } 162 162 163 - static inline void ocelot_xfh_get_cpuq(void *extraction, u64 *cpuq) 164 - { 165 - packing(extraction, cpuq, 28, 20, OCELOT_TAG_LEN, UNPACK, 0); 166 - } 167 - 168 163 static inline void ocelot_xfh_get_qos_class(void *extraction, u64 *qos_class) 169 164 { 170 165 packing(extraction, qos_class, 19, 17, OCELOT_TAG_LEN, UNPACK, 0);
-2
net/dsa/tag_ocelot.c
··· 83 83 struct dsa_port *dp; 84 84 u8 *extraction; 85 85 u16 vlan_tpid; 86 - u64 cpuq; 87 86 88 87 /* Revert skb->data by the amount consumed by the DSA master, 89 88 * so it points to the beginning of the frame. ··· 112 113 ocelot_xfh_get_qos_class(extraction, &qos_class); 113 114 ocelot_xfh_get_tag_type(extraction, &tag_type); 114 115 ocelot_xfh_get_vlan_tci(extraction, &vlan_tci); 115 - ocelot_xfh_get_cpuq(extraction, &cpuq); 116 116 117 117 skb->dev = dsa_master_find_slave(netdev, 0, src_port); 118 118 if (!skb->dev)