net: dsa: mv88e6xxx: Prevent truncation of longer interrupt names

When adding support for unique interrupt names, after testing on a few
devices, it was assumed 32 characters would be sufficient. This
assumption turned out to be incorrect, ZII RDU2 for example uses a
device base name of mv88e6xxx-30be0000.ethernet-1:0, leaving no space
for post fixes such as -g1-atu-prob and -watchdog. The names then
become identical, defeating the point of the patch.

Increase the length of the string to 64 charactoes.

Reported-by: Chris Healy <Chris.Healy@zii.aero>
Fixes: 1f9b4437f13e ("net: dsa: mv88e6xxx: Unique IRQ name")
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/mv88e6xxx/chip.h b/drivers/net/dsa/mv88e6xxx/chip.h
index f332cb4b2fbf370a8cb0cead4df2892aca1a343d..79cad5e751c6cd4784d0bf67aa3045336da400ad 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/chip.h
+++ b/drivers/net/dsa/mv88e6xxx/chip.h
@@ -236,7 +236,7 @@ struct mv88e6xxx_port {
        bool mirror_ingress;
        bool mirror_egress;
        unsigned int serdes_irq;
-       char serdes_irq_name[32];
+       char serdes_irq_name[64];
 };
 
 struct mv88e6xxx_chip {
@@ -293,16 +293,16 @@ struct mv88e6xxx_chip {
        struct mv88e6xxx_irq g1_irq;
        struct mv88e6xxx_irq g2_irq;
        int irq;
-       char irq_name[32];
+       char irq_name[64];
        int device_irq;
-       char device_irq_name[32];
+       char device_irq_name[64];
        int watchdog_irq;
-       char watchdog_irq_name[32];
+       char watchdog_irq_name[64];
 
        int atu_prob_irq;
-       char atu_prob_irq_name[32];
+       char atu_prob_irq_name[64];
        int vtu_prob_irq;
-       char vtu_prob_irq_name[32];
+       char vtu_prob_irq_name[64];
        struct kthread_worker *kworker;
        struct kthread_delayed_work irq_poll_work;