fix infinite recursion in metadata.pl

[openwrt.git] / target / linux / rdc / files / drivers / net / r6040.c

diff --git a/target/linux/rdc/files/drivers/net/r6040.c b/target/linux/rdc/files/drivers/net/r6040.c
index 2703db4..237b7fa 100644 (file)
--- a/target/linux/rdc/files/drivers/net/r6040.c
+++ b/target/linux/rdc/files/drivers/net/r6040.c
@@ -243,7 +243,7 @@ struct r6040_private {
 };
 
 struct net_device *parent_dev;
-static char *parent;
+static char *parent = "wlan0";
 module_param(parent, charp, 0444);
 MODULE_PARM_DESC(parent, "Parent network device name to get the MAC address from");
 
@@ -1326,7 +1326,7 @@ int __devinit r6040_init_one(struct pci_dev *pdev,
                               dev->name);
                        memcpy(dev->dev_addr, dflt_addr, ETH_ALEN);
                }
-               dev->dev_addr[ETH_ALEN-1] += card_idx; /* + 0 or 1 */
+               dev->dev_addr[ETH_ALEN-1] += card_idx ^ 1; /* + 0 or 1 */
        }
 
 #ifdef CONFIG_NET_POLL_CONTROLLER