Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5d6471f authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

fallout from DECLARE_MAC_BUF patches 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 13bcd5d0

drivers/net/atarilance.c

+1 −1
Original line number Diff line number Diff line
@@ -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],

drivers/net/mv643xx_eth.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {