Commit 06236ac3 authored by Maciej Żenczykowski's avatar Maciej Żenczykowski Committed by David S. Miller

net-netlink: Add a new attribute to expose TCLASS values via netlink

commit 3ceca749 added a TOS attribute.

Unfortunately TOS and TCLASS are both present in a dual-stack v6 socket,
furthermore they can have different values.  As such one cannot in a
sane way expose both through a single attribute.
Signed-off-by: default avatarMaciej Żenczyowski <maze@google.com>
CC: Murali Raja <muralira@google.com>
CC: Stephen Hemminger <shemminger@vyatta.com>
CC: Eric Dumazet <eric.dumazet@gmail.com>
CC: David S. Miller <davem@davemloft.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6d74eb94
...@@ -98,9 +98,10 @@ enum { ...@@ -98,9 +98,10 @@ enum {
INET_DIAG_VEGASINFO, INET_DIAG_VEGASINFO,
INET_DIAG_CONG, INET_DIAG_CONG,
INET_DIAG_TOS, INET_DIAG_TOS,
INET_DIAG_TCLASS,
}; };
#define INET_DIAG_MAX INET_DIAG_TOS #define INET_DIAG_MAX INET_DIAG_TCLASS
/* INET_DIAG_MEM */ /* INET_DIAG_MEM */
......
...@@ -133,8 +133,8 @@ static int inet_csk_diag_fill(struct sock *sk, ...@@ -133,8 +133,8 @@ static int inet_csk_diag_fill(struct sock *sk,
&np->rcv_saddr); &np->rcv_saddr);
ipv6_addr_copy((struct in6_addr *)r->id.idiag_dst, ipv6_addr_copy((struct in6_addr *)r->id.idiag_dst,
&np->daddr); &np->daddr);
if (ext & (1 << (INET_DIAG_TOS - 1))) if (ext & (1 << (INET_DIAG_TCLASS - 1)))
RTA_PUT_U8(skb, INET_DIAG_TOS, np->tclass); RTA_PUT_U8(skb, INET_DIAG_TCLASS, np->tclass);
} }
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment