提交 2c352948 编写于 作者: H hartleys 提交者: David S. Miller

drivers/firmware/iscsi_ibft.c: use %pM to show MAC address

Use the %pM kernel extension to display the MAC address.

Also, remove the 'mac' variable and use nic->mac directly.
Signed-off-by: NH Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: NPeter Jones <pjones@redhat.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 aaa09ee7
...@@ -380,7 +380,6 @@ static ssize_t ibft_attr_show_nic(struct ibft_kobject *entry, ...@@ -380,7 +380,6 @@ static ssize_t ibft_attr_show_nic(struct ibft_kobject *entry,
struct ibft_nic *nic = entry->nic; struct ibft_nic *nic = entry->nic;
void *ibft_loc = entry->header; void *ibft_loc = entry->header;
char *str = buf; char *str = buf;
char *mac;
int val; int val;
if (!nic) if (!nic)
...@@ -421,10 +420,7 @@ static ssize_t ibft_attr_show_nic(struct ibft_kobject *entry, ...@@ -421,10 +420,7 @@ static ssize_t ibft_attr_show_nic(struct ibft_kobject *entry,
str += sprintf(str, "%d\n", nic->vlan); str += sprintf(str, "%d\n", nic->vlan);
break; break;
case ibft_eth_mac: case ibft_eth_mac:
mac = nic->mac; str += sprintf(str, "%pM\n", nic->mac);
str += sprintf(str, "%02x:%02x:%02x:%02x:%02x:%02x\n",
(u8)mac[0], (u8)mac[1], (u8)mac[2],
(u8)mac[3], (u8)mac[4], (u8)mac[5]);
break; break;
case ibft_eth_hostname: case ibft_eth_hostname:
str += sprintf_string(str, nic->hostname_len, str += sprintf_string(str, nic->hostname_len,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册