Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 219860
b: refs/heads/master
c: d225eef
h: refs/heads/master
v: v3
  • Loading branch information
Andy Shevchenko authored and Greg Kroah-Hartman committed Sep 16, 2010
1 parent 5c1f6de commit e6c4bdf
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 28dc55bc9a6c1ab2a80ee2daa935be4598e0a6f6
refs/heads/master: d225eef71c0dccdcbf31016820029d835a13b9e3
5 changes: 1 addition & 4 deletions trunk/drivers/staging/octeon/ethernet.c
Original file line number Diff line number Diff line change
Expand Up @@ -465,10 +465,7 @@ int cvm_oct_common_init(struct net_device *dev)

if (cvm_oct_mac_addr_offset >= octeon_bootinfo->mac_addr_count)
printk(KERN_DEBUG "%s: Using MAC outside of the assigned range:"
" %02x:%02x:%02x:%02x:%02x:%02x\n", dev->name,
sa.sa_data[0] & 0xff, sa.sa_data[1] & 0xff,
sa.sa_data[2] & 0xff, sa.sa_data[3] & 0xff,
sa.sa_data[4] & 0xff, sa.sa_data[5] & 0xff);
" %pM\n", dev->name, &sa.sa_data[0]);
cvm_oct_mac_addr_offset++;

/*
Expand Down

0 comments on commit e6c4bdf

Please sign in to comment.