2 files changed, 36 insertions, 5 deletions

diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index 56d0799e7b4b..b298e5d68be2 100644
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -417,6 +417,8 @@ enum {
 #define B43_PHYTYPE_HT                  0x07
 #define B43_PHYTYPE_LCN                 0x08
 #define B43_PHYTYPE_LCNXN               0x09
+#define B43_PHYTYPE_LCN40               0x0a
+#define B43_PHYTYPE_AC                  0x0b
 
 /* PHYRegisters */
 #define B43_PHY_ILT_A_CTRL              0x0072
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 724c771133cc..5efa77884704 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -4277,6 +4277,35 @@ out:
         return err;
 }
 
+static char *b43_phy_name(struct b43_wldev *dev, u8 phy_type)
+{
+        switch (phy_type) {
+        case B43_PHYTYPE_A:
+                return "A";
+        case B43_PHYTYPE_B:
+                return "B";
+        case B43_PHYTYPE_G:
+                return "G";
+        case B43_PHYTYPE_N:
+                return "N";
+        case B43_PHYTYPE_LP:
+                return "LP";
+        case B43_PHYTYPE_SSLPN:
+                return "SSLPN";
+        case B43_PHYTYPE_HT:
+                return "HT";
+        case B43_PHYTYPE_LCN:
+                return "LCN";
+        case B43_PHYTYPE_LCNXN:
+                return "LCNXN";
+        case B43_PHYTYPE_LCN40:
+                return "LCN40";
+        case B43_PHYTYPE_AC:
+                return "AC";
+        }
+        return "UNKNOWN";
+}
+
 /* Get PHY and RADIO versioning numbers */
 static int b43_phy_versioning(struct b43_wldev *dev)
 {
@@ -4337,13 +4366,13 @@ static int b43_phy_versioning(struct b43_wldev *dev)
                 unsupported = 1;
         }
         if (unsupported) {
-                b43err(dev->wl, "FOUND UNSUPPORTED PHY "
-                       "(Analog %u, Type %u, Revision %u)\n",
-                       analog_type, phy_type, phy_rev);
+                b43err(dev->wl, "FOUND UNSUPPORTED PHY (Analog %u, Type %d (%s), Revision %u)\n",
+                       analog_type, phy_type, b43_phy_name(dev, phy_type),
+                       phy_rev);
                 return -EOPNOTSUPP;
         }
-        b43dbg(dev->wl, "Found PHY: Analog %u, Type %u, Revision %u\n",
-               analog_type, phy_type, phy_rev);
+        b43info(dev->wl, "Found PHY: Analog %u, Type %d (%s), Revision %u\n",
+                analog_type, phy_type, b43_phy_name(dev, phy_type), phy_rev);
 
         /* Get RADIO versioning */
         if (dev->dev->core_rev >= 24) {