diff --git a/[refs] b/[refs] index 6025d0efe85c..507e26cd5fc0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a986ce45d45b099ddf676c340267765e76db91e +refs/heads/master: 6f9d47220eb2d1b17a0a3ecaf1b564ff95b8393d diff --git a/trunk/drivers/net/acenic.c b/trunk/drivers/net/acenic.c index b8953de5664a..b508812e97ac 100644 --- a/trunk/drivers/net/acenic.c +++ b/trunk/drivers/net/acenic.c @@ -1002,6 +1002,8 @@ static int __devinit ace_init(struct net_device *dev) mac1 = 0; for(i = 0; i < 4; i++) { + int tmp; + mac1 = mac1 << 8; tmp = read_eeprom_byte(dev, 0x8c+i); if (tmp < 0) { @@ -1012,6 +1014,8 @@ static int __devinit ace_init(struct net_device *dev) } mac2 = 0; for(i = 4; i < 8; i++) { + int tmp; + mac2 = mac2 << 8; tmp = read_eeprom_byte(dev, 0x8c+i); if (tmp < 0) {