atheros: various braces fixes

[openwrt/staging/mkresin.git] / target / linux / atheros / patches-3.10 / 220-enet_micrel_workaround.patch

diff --git a/target/linux/atheros/patches-3.10/220-enet_micrel_workaround.patch b/target/linux/atheros/patches-3.10/220-enet_micrel_workaround.patch
index 35344ca73aefc9648b56df5278fe6fe379dbb4f8..d7a4d4ad6151c535d236bd13a3cb6428cc40186c 100644 (file)
--- a/target/linux/atheros/patches-3.10/220-enet_micrel_workaround.patch
+++ b/target/linux/atheros/patches-3.10/220-enet_micrel_workaround.patch
@@ -4,7 +4,7 @@
  static int ar231x_mdiobus_reset(struct mii_bus *bus);
  static int ar231x_mdiobus_probe (struct net_device *dev);
  static void ar231x_adjust_link(struct net_device *dev);
-+static bool no_phy = false;
++static bool no_phy;
  
  #ifndef ERR
  #define ERR(fmt, args...) printk("%s: " fmt, __func__, ##args)
@@ -78,7 +78,7 @@
        kfree(dev);
        return 0;
  }
-@@ -1120,6 +1166,9 @@ static int ar231x_ioctl(struct net_devic
+@@ -1115,6 +1161,9 @@ static int ar231x_ioctl(struct net_devic
        struct ar231x_private *sp = netdev_priv(dev);
        int ret;
  
@@ -86,5 +86,5 @@
 +              return -ENODEV;
 +
        switch (cmd) {
- 
        case SIOCETHTOOL:
+               spin_lock_irq(&sp->lock);