mirror of https://gitee.com/openkylin/linux.git
cxgb4: Use %pM format specifier for MAC addresses
Convert to %pM instead of using custom code. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
19acc9c5d0
commit
0992b49023
|
@ -1813,12 +1813,8 @@ static int mps_tcam_show(struct seq_file *seq, void *v)
|
||||||
/* Inner header lookup */
|
/* Inner header lookup */
|
||||||
if (lookup_type && (lookup_type != DATALKPTYPE_M)) {
|
if (lookup_type && (lookup_type != DATALKPTYPE_M)) {
|
||||||
seq_printf(seq,
|
seq_printf(seq,
|
||||||
"%3u %02x:%02x:%02x:%02x:%02x:%02x "
|
"%3u %pM %012llx %06x %06x - - %3c 'I' %4x %3c %#x%4u%4d",
|
||||||
"%012llx %06x %06x - - %3c"
|
idx, addr,
|
||||||
" 'I' %4x "
|
|
||||||
"%3c %#x%4u%4d", idx, addr[0],
|
|
||||||
addr[1], addr[2], addr[3],
|
|
||||||
addr[4], addr[5],
|
|
||||||
(unsigned long long)mask,
|
(unsigned long long)mask,
|
||||||
vniy, (vnix | vniy),
|
vniy, (vnix | vniy),
|
||||||
dip_hit ? 'Y' : 'N',
|
dip_hit ? 'Y' : 'N',
|
||||||
|
@ -1830,10 +1826,8 @@ static int mps_tcam_show(struct seq_file *seq, void *v)
|
||||||
T6_VF_G(cls_lo) : -1);
|
T6_VF_G(cls_lo) : -1);
|
||||||
} else {
|
} else {
|
||||||
seq_printf(seq,
|
seq_printf(seq,
|
||||||
"%3u %02x:%02x:%02x:%02x:%02x:%02x "
|
"%3u %pM %012llx - - ",
|
||||||
"%012llx - - ",
|
idx, addr,
|
||||||
idx, addr[0], addr[1], addr[2],
|
|
||||||
addr[3], addr[4], addr[5],
|
|
||||||
(unsigned long long)mask);
|
(unsigned long long)mask);
|
||||||
|
|
||||||
if (vlan_vld)
|
if (vlan_vld)
|
||||||
|
@ -1851,10 +1845,8 @@ static int mps_tcam_show(struct seq_file *seq, void *v)
|
||||||
T6_VF_G(cls_lo) : -1);
|
T6_VF_G(cls_lo) : -1);
|
||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
seq_printf(seq, "%3u %02x:%02x:%02x:%02x:%02x:%02x "
|
seq_printf(seq, "%3u %pM %012llx%3c %#x%4u%4d",
|
||||||
"%012llx%3c %#x%4u%4d",
|
idx, addr, (unsigned long long)mask,
|
||||||
idx, addr[0], addr[1], addr[2], addr[3],
|
|
||||||
addr[4], addr[5], (unsigned long long)mask,
|
|
||||||
(cls_lo & SRAM_VLD_F) ? 'Y' : 'N',
|
(cls_lo & SRAM_VLD_F) ? 'Y' : 'N',
|
||||||
PORTMAP_G(cls_hi),
|
PORTMAP_G(cls_hi),
|
||||||
PF_G(cls_lo),
|
PF_G(cls_lo),
|
||||||
|
|
Loading…
Reference in New Issue