fallout from DECLARE_MAC_BUF patches
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
13bcd5d0e2
commit
c5d6471ff9
|
@ -1023,7 +1023,7 @@ static int lance_rx( struct net_device *dev )
|
|||
DECLARE_MAC_BUF(mac);
|
||||
DECLARE_MAC_BUF(mac2);
|
||||
|
||||
printk(KERN_DEBUG "%s: RX pkt type 0x%04x from %s to %s ",
|
||||
printk(KERN_DEBUG "%s: RX pkt type 0x%04x from %s to %s "
|
||||
"data %02x %02x %02x %02x %02x %02x %02x %02x "
|
||||
"len %d\n",
|
||||
dev->name, ((u_short *)data)[6],
|
||||
|
|
|
@ -784,7 +784,6 @@ static int mv643xx_eth_open(struct net_device *dev)
|
|||
unsigned int port_num = mp->port_num;
|
||||
unsigned int size;
|
||||
int err;
|
||||
DECLARE_MAC_BUF(mac);
|
||||
|
||||
/* Clear any pending ethernet port interrupts */
|
||||
mv_write(MV643XX_ETH_INTERRUPT_CAUSE_REG(port_num), 0);
|
||||
|
@ -1296,6 +1295,7 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
|
|||
struct ethtool_cmd cmd;
|
||||
int duplex = DUPLEX_HALF;
|
||||
int speed = 0; /* default to auto-negotiation */
|
||||
DECLARE_MAC_BUF(mac);
|
||||
|
||||
pd = pdev->dev.platform_data;
|
||||
if (pd == NULL) {
|
||||
|
|
Loading…
Reference in New Issue