|
@@ -3248,22 +3248,21 @@ static void gfar_set_mac_for_addr(struct net_device *dev, int num,
|
|
{
|
|
{
|
|
struct gfar_private *priv = netdev_priv(dev);
|
|
struct gfar_private *priv = netdev_priv(dev);
|
|
struct gfar __iomem *regs = priv->gfargrp[0].regs;
|
|
struct gfar __iomem *regs = priv->gfargrp[0].regs;
|
|
- int idx;
|
|
|
|
- char tmpbuf[ETH_ALEN];
|
|
|
|
u32 tempval;
|
|
u32 tempval;
|
|
u32 __iomem *macptr = ®s->macstnaddr1;
|
|
u32 __iomem *macptr = ®s->macstnaddr1;
|
|
|
|
|
|
macptr += num*2;
|
|
macptr += num*2;
|
|
|
|
|
|
- /* Now copy it into the mac registers backwards, cuz
|
|
|
|
- * little endian is silly
|
|
|
|
|
|
+ /* For a station address of 0x12345678ABCD in transmission
|
|
|
|
+ * order (BE), MACnADDR1 is set to 0xCDAB7856 and
|
|
|
|
+ * MACnADDR2 is set to 0x34120000.
|
|
*/
|
|
*/
|
|
- for (idx = 0; idx < ETH_ALEN; idx++)
|
|
|
|
- tmpbuf[ETH_ALEN - 1 - idx] = addr[idx];
|
|
|
|
|
|
+ tempval = (addr[5] << 24) | (addr[4] << 16) |
|
|
|
|
+ (addr[3] << 8) | addr[2];
|
|
|
|
|
|
- gfar_write(macptr, *((u32 *) (tmpbuf)));
|
|
|
|
|
|
+ gfar_write(macptr, tempval);
|
|
|
|
|
|
- tempval = *((u32 *) (tmpbuf + 4));
|
|
|
|
|
|
+ tempval = (addr[1] << 24) | (addr[0] << 16);
|
|
|
|
|
|
gfar_write(macptr+1, tempval);
|
|
gfar_write(macptr+1, tempval);
|
|
}
|
|
}
|