Skip to content

Commit b567741

Browse files
tomratbertdavem330
authored andcommitted
ipv6: Enable auto flow labels by default
Initialize auto_flowlabels to one. This enables automatic flow labels, individual socket may disable them using the IPV6_AUTOFLOWLABEL socket option. Signed-off-by: Tom Herbert <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent be26849 commit b567741

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Documentation/networking/ip-sysctl.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1228,7 +1228,7 @@ auto_flowlabels - INTEGER
12281228
per socket basis using the IPV6_AUTOFLOWLABEL socket option
12291229
3: automatic flow labels are enabled and enforced, they cannot
12301230
be disabled by the socket option
1231-
Default: 0
1231+
Default: 1
12321232

12331233
flowlabel_state_ranges - BOOLEAN
12341234
Split the flow label number space into two ranges. 0-0x7FFFF is

include/net/ipv6.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,7 @@ static inline void iph_to_flow_copy_v6addrs(struct flow_keys *flow,
716716

717717
#define IP6_AUTO_FLOW_LABEL_MAX IP6_AUTO_FLOW_LABEL_FORCED
718718

719-
#define IP6_DEFAULT_AUTO_FLOW_LABELS IP6_AUTO_FLOW_LABEL_OFF
719+
#define IP6_DEFAULT_AUTO_FLOW_LABELS IP6_AUTO_FLOW_LABEL_OPTOUT
720720

721721
static inline __be32 ip6_make_flowlabel(struct net *net, struct sk_buff *skb,
722722
__be32 flowlabel, bool autolabel,

0 commit comments

Comments
 (0)