diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-21 06:21:08 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-21 06:21:08 -0500 |
| commit | c2a7dcad9f0d92d7a96e735abb8bec7b9c621536 (patch) | |
| tree | bf9b20fdd5ab07e5b0e4e0b95c6a3dbab1005cb9 /drivers/net/starfire.c | |
| parent | 373a6da165ac3012a74fd072da340eabca55d031 (diff) | |
| parent | ea67db4cdbbf7f4e74150e71da0984e25121f500 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/net/starfire.c')
| -rw-r--r-- | drivers/net/starfire.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c index bcc430bd9e..6e00dc857a 100644 --- a/drivers/net/starfire.c +++ b/drivers/net/starfire.c | |||
| @@ -1742,7 +1742,7 @@ static void set_rx_mode(struct net_device *dev) | |||
| 1742 | if (vlan_group_get_device(np->vlgrp, i)) { | 1742 | if (vlan_group_get_device(np->vlgrp, i)) { |
| 1743 | if (vlan_count >= 32) | 1743 | if (vlan_count >= 32) |
| 1744 | break; | 1744 | break; |
| 1745 | writew(cpu_to_be16(i), filter_addr); | 1745 | writew(i, filter_addr); |
| 1746 | filter_addr += 16; | 1746 | filter_addr += 16; |
| 1747 | vlan_count++; | 1747 | vlan_count++; |
| 1748 | } | 1748 | } |