diff options
| author | thompsa <thompsa@FreeBSD.org> | 2012-03-07 07:22:53 +0000 |
|---|---|---|
| committer | thompsa <thompsa@FreeBSD.org> | 2012-03-07 07:22:53 +0000 |
| commit | 1ead29e7154b634bb94ffd418424a2000e42c68c (patch) | |
| tree | 5906303337693e952c9085e8b84f815d45bd2f19 | |
| parent | 44297709fcc35e8a833d7802f959eca3933ead86 (diff) | |
| download | FreeBSD-src-1ead29e7154b634bb94ffd418424a2000e42c68c.zip FreeBSD-src-1ead29e7154b634bb94ffd418424a2000e42c68c.tar.gz | |
Move the vlan buffer space into the union which also fixes an unused variable
warning with !INET & !INET6.
Spotted by: pluknet
| -rw-r--r-- | sys/net/if_lagg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index 892a256..ba19c52 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -1438,7 +1438,6 @@ lagg_hashmbuf(struct lagg_softc *sc, struct mbuf *m, uint32_t key) uint32_t p = key; int off; struct ether_header *eh; - struct ether_vlan_header vlanbuf; const struct ether_vlan_header *vlan; #ifdef INET const struct ip *ip; @@ -1456,6 +1455,7 @@ lagg_hashmbuf(struct lagg_softc *sc, struct mbuf *m, uint32_t key) #ifdef INET6 struct ip6_hdr ip6; #endif + struct ether_vlan_header vlan; uint32_t port; } buf; @@ -1475,7 +1475,7 @@ lagg_hashmbuf(struct lagg_softc *sc, struct mbuf *m, uint32_t key) p = hash32_buf(&m->m_pkthdr.ether_vtag, sizeof(m->m_pkthdr.ether_vtag), p); } else if (etype == ETHERTYPE_VLAN) { - vlan = lagg_gethdr(m, off, sizeof(*vlan), &vlanbuf); + vlan = lagg_gethdr(m, off, sizeof(*vlan), &buf); if (vlan == NULL) goto out; |
