diff options
author | Florent Fourcot <florent.fourcot@enst-bretagne.fr> | 2014-01-17 11:15:04 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-01-19 20:12:31 -0500 |
commit | 46e5f401762c639e38eea350d335c0f54ec2442f (patch) | |
tree | 76f12d6f2425d05a13f09e27cd66c981b29312f4 /net/ipv6/ip6_flowlabel.c | |
parent | df3687ffc6653e4d32168338b4dee20c164ed7c9 (diff) |
ipv6: add a flag to get the flow label used remotly
This information is already available via IPV6_FLOWINFO
of IPV6_2292PKTOPTIONS, and them a filtering to get the flow label
information. But it is probably logical and easier for users to add this
here, and to control both sent/received flow label values with the
IPV6_FLOWLABEL_MGR option.
Signed-off-by: Florent Fourcot <florent.fourcot@enst-bretagne.fr>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_flowlabel.c')
-rw-r--r-- | net/ipv6/ip6_flowlabel.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c index 55823f187446..01bf2524c72a 100644 --- a/net/ipv6/ip6_flowlabel.c +++ b/net/ipv6/ip6_flowlabel.c | |||
@@ -481,11 +481,17 @@ static inline void fl_link(struct ipv6_pinfo *np, struct ipv6_fl_socklist *sfl, | |||
481 | spin_unlock_bh(&ip6_sk_fl_lock); | 481 | spin_unlock_bh(&ip6_sk_fl_lock); |
482 | } | 482 | } |
483 | 483 | ||
484 | int ipv6_flowlabel_opt_get(struct sock *sk, struct in6_flowlabel_req *freq) | 484 | int ipv6_flowlabel_opt_get(struct sock *sk, struct in6_flowlabel_req *freq, |
485 | int flags) | ||
485 | { | 486 | { |
486 | struct ipv6_pinfo *np = inet6_sk(sk); | 487 | struct ipv6_pinfo *np = inet6_sk(sk); |
487 | struct ipv6_fl_socklist *sfl; | 488 | struct ipv6_fl_socklist *sfl; |
488 | 489 | ||
490 | if (flags & IPV6_FL_F_REMOTE) { | ||
491 | freq->flr_label = np->rcv_flowinfo & IPV6_FLOWLABEL_MASK; | ||
492 | return 0; | ||
493 | } | ||
494 | |||
489 | if (np->repflow) { | 495 | if (np->repflow) { |
490 | freq->flr_label = np->flow_label; | 496 | freq->flr_label = np->flow_label; |
491 | return 0; | 497 | return 0; |