[PATCH 1/2] make more room for MAC addrs (take 2)