summaryrefslogtreecommitdiffstats
path: root/drivers/ssb
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2013-03-11 21:38:26 +0100
committerJohn W. Linville <linville@tuxdriver.com>2013-03-13 19:23:02 +0100
commita9fac7399b45db668faeca6c33873d249111cf8b (patch)
tree93ade422903c19d013bb3bfeb0ff9cadb5fe8dee /drivers/ssb
parentmwl8k: don't overwrite regulatory settings on fw reload (diff)
downloadlinux-a9fac7399b45db668faeca6c33873d249111cf8b.tar.xz
linux-a9fac7399b45db668faeca6c33873d249111cf8b.zip
ssb: pci: Fix flipping of MAC address
Since commit e565275 entitled "ssb: pci: Standardize a function to get mac address", the SPROM readout of the MAC has had the values flipped so that 00:11:22:33:44:55 became 11:00:33:22:55:44. The fix has been tested on both little- and big-endian architectures. Reported-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/ssb')
-rw-r--r--drivers/ssb/pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c
index 6d6e7b926aa5..63ff69f9d3eb 100644
--- a/drivers/ssb/pci.c
+++ b/drivers/ssb/pci.c
@@ -234,8 +234,8 @@ static void sprom_get_mac(char *mac, const u16 *in)
{
int i;
for (i = 0; i < 3; i++) {
- *mac++ = in[i];
*mac++ = in[i] >> 8;
+ *mac++ = in[i];
}
}