diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-04-28 10:18:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-28 10:18:33 -0400 |
| commit | ed8ba2e92048e4164fa91e70aa3ed5e31f85bba1 (patch) | |
| tree | 20b798cba8d4d5a629cf8a8a7ce776c4b8324de3 /isisd/isis_pfpacket.c | |
| parent | 94248997abd70f8e506e1909930828f02c9160ae (diff) | |
| parent | 2b67862ccac99737913a674b3e9138a49a44421d (diff) | |
Merge pull request #423 from opensourcerouting/feature/isis-mt
IS-IS multi topology
Diffstat (limited to 'isisd/isis_pfpacket.c')
| -rw-r--r-- | isisd/isis_pfpacket.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/isisd/isis_pfpacket.c b/isisd/isis_pfpacket.c index dd07a9c6f5..5c434b90d1 100644 --- a/isisd/isis_pfpacket.c +++ b/isisd/isis_pfpacket.c @@ -371,7 +371,9 @@ isis_send_pdu_bcast (struct isis_circuit *circuit, int level) stream_set_getp (circuit->snd_stream, 0); memset (&sa, 0, sizeof (struct sockaddr_ll)); sa.sll_family = AF_PACKET; - sa.sll_protocol = htons (stream_get_endp (circuit->snd_stream) + LLC_LEN); + + size_t frame_size = stream_get_endp(circuit->snd_stream) + LLC_LEN; + sa.sll_protocol = htons(isis_ethertype(frame_size)); sa.sll_ifindex = circuit->interface->ifindex; sa.sll_halen = ETH_ALEN; /* RFC5309 section 4.1 recommends ALL_ISS */ @@ -418,7 +420,6 @@ isis_send_pdu_p2p (struct isis_circuit *circuit, int level) stream_set_getp (circuit->snd_stream, 0); memset (&sa, 0, sizeof (struct sockaddr_ll)); sa.sll_family = AF_PACKET; - sa.sll_protocol = htons (stream_get_endp (circuit->snd_stream) + LLC_LEN); sa.sll_ifindex = circuit->interface->ifindex; sa.sll_halen = ETH_ALEN; if (level == 1) |