Commit dcfe7673787b4bfea2c213df443d312aa754757b ("net: dsa: tag_sja1105: absorb logic for not overwriting precise info into dsa_8021q_rcv()") added support to let the DSA switch driver set source_port and switch_id. tag_8021q's logic overrides the previously set source_port and switch_id only if they are marked as "invalid" (-1). sja1105 and vsc73xx drivers are doing that properly, but ocelot_8021q driver doesn't initialize those variables. That causes dsa_8021q_rcv() doesn't set them, and they remain unassigned.
Initialize them as invalid to so dsa_8021q_rcv() can return with the proper values.
Fixes: dcfe7673787b ("net: dsa: tag_sja1105: absorb logic for not overwriting precise info into dsa_8021q_rcv()") Signed-off-by: Robert Hodaszi robert.hodaszi@digi.com --- Cc: stable@vger.kernel.org --- net/dsa/tag_ocelot_8021q.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/dsa/tag_ocelot_8021q.c b/net/dsa/tag_ocelot_8021q.c index 8e8b1bef6af6..11ea8cfd6266 100644 --- a/net/dsa/tag_ocelot_8021q.c +++ b/net/dsa/tag_ocelot_8021q.c @@ -79,7 +79,7 @@ static struct sk_buff *ocelot_xmit(struct sk_buff *skb, static struct sk_buff *ocelot_rcv(struct sk_buff *skb, struct net_device *netdev) { - int src_port, switch_id; + int src_port = -1, switch_id = -1;
dsa_8021q_rcv(skb, &src_port, &switch_id, NULL, NULL);
On Wed, Dec 11, 2024 at 03:29:32PM +0100, Robert Hodaszi wrote:
Commit dcfe7673787b4bfea2c213df443d312aa754757b ("net: dsa: tag_sja1105: absorb logic for not overwriting precise info into dsa_8021q_rcv()") added support to let the DSA switch driver set source_port and switch_id. tag_8021q's logic overrides the previously set source_port and switch_id only if they are marked as "invalid" (-1). sja1105 and vsc73xx drivers are doing that properly, but ocelot_8021q driver doesn't initialize those variables. That causes dsa_8021q_rcv() doesn't set them, and they remain unassigned.
Initialize them as invalid to so dsa_8021q_rcv() can return with the proper values.
Fixes: dcfe7673787b ("net: dsa: tag_sja1105: absorb logic for not overwriting precise info into dsa_8021q_rcv()") Signed-off-by: Robert Hodaszi robert.hodaszi@digi.com
Hi Robert
The code is easy, processes are hard.
We ask that you put a version number in the subject
[PATCH v2 net] ....
That helps us keep track of the different versions of a patch.
Please wait 24 hours, and then post v3 with Vladimirs suggestions.
Andrew
--- pw-bot: cr
2024. 12. 11. 17:11 keltezéssel, Andrew Lunn írta:
[EXTERNAL E-MAIL] Warning! This email originated outside of the organization! Do not click links or open attachments unless you recognize the sender and know the content is safe.
On Wed, Dec 11, 2024 at 03:29:32PM +0100, Robert Hodaszi wrote:
Commit dcfe7673787b4bfea2c213df443d312aa754757b ("net: dsa: tag_sja1105: absorb logic for not overwriting precise info into dsa_8021q_rcv()") added support to let the DSA switch driver set source_port and switch_id. tag_8021q's logic overrides the previously set source_port and switch_id only if they are marked as "invalid" (-1). sja1105 and vsc73xx drivers are doing that properly, but ocelot_8021q driver doesn't initialize those variables. That causes dsa_8021q_rcv() doesn't set them, and they remain unassigned.
Initialize them as invalid to so dsa_8021q_rcv() can return with the proper values.
Fixes: dcfe7673787b ("net: dsa: tag_sja1105: absorb logic for not overwriting precise info into dsa_8021q_rcv()") Signed-off-by: Robert Hodaszi robert.hodaszi@digi.com
Hi Robert
The code is easy, processes are hard.
We ask that you put a version number in the subject
[PATCH v2 net] ....
That helps us keep track of the different versions of a patch.
Please wait 24 hours, and then post v3 with Vladimirs suggestions.
Andrew
pw-bot: cr
I already sent out one with '[PATCH net v2]'. Vladimir reviewed that. (Sorry for this email burst!)
Robert
linux-stable-mirror@lists.linaro.org
-
Andrew Lunn -
Robert Hodaszi