In pktb_alloc, declare struct ethhdr *ethhdr at function start, thus avoiding cute braces on case AF_BRIDGE. This costs nothing and generates less code. Signed-off-by: Duncan Roe <duncan_roe@xxxxxxxxxxxxxxx> --- src/extra/pktbuff.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/extra/pktbuff.c b/src/extra/pktbuff.c index 37f6bc0..b7d379e 100644 --- a/src/extra/pktbuff.c +++ b/src/extra/pktbuff.c @@ -53,6 +53,7 @@ struct pkt_buff *pktb_alloc(int family, void *data, size_t len, size_t extra) { struct pkt_buff *pktb; void *pkt_data; + struct ethhdr *ethhdr; pktb = calloc(1, sizeof(struct pkt_buff) + len + extra); if (pktb == NULL) @@ -74,9 +75,8 @@ struct pkt_buff *pktb_alloc(int family, void *data, size_t len, size_t extra) case AF_INET6: pktb->network_header = pktb->data; break; - case AF_BRIDGE: { - struct ethhdr *ethhdr = (struct ethhdr *)pktb->data; - + case AF_BRIDGE: + ethhdr = (struct ethhdr *)pktb->data; pktb->mac_header = pktb->data; switch(ethhdr->h_proto) { @@ -92,7 +92,6 @@ struct pkt_buff *pktb_alloc(int family, void *data, size_t len, size_t extra) } break; } - } return pktb; } -- 2.14.5