On Fri, 2007-08-31 at 15:24 -0700, Joe Perches wrote: > On Sat, 2007-09-01 at 00:21 +0200, Johannes Berg wrote: > > On Fri, 2007-08-31 at 15:16 -0700, Joe Perches wrote: > > > please pull from: > > > git pull git://repo.or.cz/linux-2.6/trivial-mods.git net-2.6.24-print_mac > > got a gitweb for that somewhere? > > Does this work for you? > > http://repo.or.cz/w/linux-2.6/trivial-mods.git
I think you got a bit too trigger-happy:
p += sprintf(p, "key[%d] alg=CCMP key_set=%d "
- "tx_pn=%02x%02x%02x%02x%02x%02x "
- "rx_pn=%02x%02x%02x%02x%02x%02x "
+ "tx_pn=%s "
+ "rx_pn=%s "
"format_errors=%d replays=%d decrypt_errors=%d\n",
ccmp->key_idx, ccmp->key_set,
- MAC_ARG(ccmp->tx_pn), MAC_ARG(ccmp->rx_pn),
+ print_mac(mac, ccmp->tx_pn), print_mac(mac2, ccmp->rx_pn),
the PN is a number, not a MAC address :) The fact that it used MAC_ARG,
was, I guess, just laziness of the original author since the PN is also
6 bytes long. That said, I can live with it being printed this way too,
it's just a bit weird.
Going to be fun to merge with my 70 outstanding patches though :)
johannes
signature.asc
Description: This is a digitally signed message part
