renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-11-19 08:05:27 +08:00
Code

fallout from DECLARE_MAC_BUF patches

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Al Viro 2007-10-13 08:30:26 +01:00 committed by Linus Torvalds
parent 13bcd5d0e2
commit c5d6471ff9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/atarilance.c
View File

@ -1023,7 +1023,7 @@ static int lance_rx( struct net_device *dev )
DECLARE_MAC_BUF(mac); DECLARE_MAC_BUF(mac);
DECLARE_MAC_BUF(mac2); 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 " "data %02x %02x %02x %02x %02x %02x %02x %02x "
"len %d\n", "len %d\n",
dev->name, ((u_short *)data)[6], dev->name, ((u_short *)data)[6],

2
drivers/net/mv643xx_eth.c
View File

@ -784,7 +784,6 @@ static int mv643xx_eth_open(struct net_device *dev)
unsigned int port_num = mp->port_num; unsigned int port_num = mp->port_num;
unsigned int size; unsigned int size;
int err; int err;
DECLARE_MAC_BUF(mac);
/* Clear any pending ethernet port interrupts */ /* Clear any pending ethernet port interrupts */
mv_write(MV643XX_ETH_INTERRUPT_CAUSE_REG(port_num), 0); 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; struct ethtool_cmd cmd;
int duplex = DUPLEX_HALF; int duplex = DUPLEX_HALF;
int speed = 0; /* default to auto-negotiation */ int speed = 0; /* default to auto-negotiation */
DECLARE_MAC_BUF(mac);
pd = pdev->dev.platform_data; pd = pdev->dev.platform_data;
if (pd == NULL) { if (pd == NULL) {