diff --git a/[refs] b/[refs]
index 691c395ccd1a..5aad40455c4f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a1aa309f21ea2f6c31f364341e4027ecf4e79bc
+refs/heads/master: 19443178fbfbf40db15c86012fc37df1a44ab857
diff --git a/trunk/net/dccp/feat.c b/trunk/net/dccp/feat.c
index 4a4f6ce4498d..933a0ecf8d46 100644
--- a/trunk/net/dccp/feat.c
+++ b/trunk/net/dccp/feat.c
@@ -32,7 +32,7 @@ int dccp_feat_change(struct dccp_minisock *dmsk, u8 type, u8 feature,
 
 	if (len > 3) {
 		DCCP_WARN("invalid length %d\n", len);
-		return 1;
+		return -EINVAL;
 	}
 	/* XXX add further sanity checks */