Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 183337
b: refs/heads/master
c: d998ab0
h: refs/heads/master
i:
  183335: 97ab7ff
v: v3
  • Loading branch information
H Hartley Sweeten authored and David S. Miller committed Dec 30, 2009
1 parent 1e5e430 commit 309b1f5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 19 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: 5491f3a5623129f3d4e0c62e691c2a5e56c75d41
refs/heads/master: d998ab0bd737fad9c8e3c88eb6f52c43e90fda9a
24 changes: 6 additions & 18 deletions trunk/drivers/s390/net/qeth_l2_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -486,22 +486,14 @@ static int qeth_l2_send_setmac_cb(struct qeth_card *card,
case IPA_RC_L2_DUP_MAC:
case IPA_RC_L2_DUP_LAYER3_MAC:
dev_warn(&card->gdev->dev,
"MAC address "
"%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x "
"already exists\n",
card->dev->dev_addr[0], card->dev->dev_addr[1],
card->dev->dev_addr[2], card->dev->dev_addr[3],
card->dev->dev_addr[4], card->dev->dev_addr[5]);
"MAC address %pM already exists\n",
card->dev->dev_addr);
break;
case IPA_RC_L2_MAC_NOT_AUTH_BY_HYP:
case IPA_RC_L2_MAC_NOT_AUTH_BY_ADP:
dev_warn(&card->gdev->dev,
"MAC address "
"%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x "
"is not authorized\n",
card->dev->dev_addr[0], card->dev->dev_addr[1],
card->dev->dev_addr[2], card->dev->dev_addr[3],
card->dev->dev_addr[4], card->dev->dev_addr[5]);
"MAC address %pM is not authorized\n",
card->dev->dev_addr);
break;
default:
break;
Expand All @@ -512,12 +504,8 @@ static int qeth_l2_send_setmac_cb(struct qeth_card *card,
memcpy(card->dev->dev_addr, cmd->data.setdelmac.mac,
OSA_ADDR_LEN);
dev_info(&card->gdev->dev,
"MAC address %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x "
"successfully registered on device %s\n",
card->dev->dev_addr[0], card->dev->dev_addr[1],
card->dev->dev_addr[2], card->dev->dev_addr[3],
card->dev->dev_addr[4], card->dev->dev_addr[5],
card->dev->name);
"MAC address %pM successfully registered on device %s\n",
card->dev->dev_addr, card->dev->name);
}
return 0;
}
Expand Down

0 comments on commit 309b1f5

Please sign in to comment.