summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorent Fourcot <florent.fourcot@enst-bretagne.fr>2013-12-12 17:07:58 +0100
committerDavid S. Miller <davem@davemloft.net>2013-12-12 22:14:09 +0100
commit68536053600425c24aba031c45f053d447eedd9c (patch)
tree661c49e46f3ccaca03870b414dd4063373932d86
parentnet: eth: 8390: remove section warning in etherh.c (diff)
downloadlinux-68536053600425c24aba031c45f053d447eedd9c.tar.xz
linux-68536053600425c24aba031c45f053d447eedd9c.zip
ipv6: fix incorrect type in declaration
Introduced by 1397ed35f22d7c30d0b89ba74b6b7829220dfcfd "ipv6: add flowinfo for tcp6 pkt_options for all cases" Reported-by: kbuild test robot <fengguang.wu@intel.com> V2: fix the title, add empty line after the declaration (Sergei Shtylyov feedbacks) Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv6/ipv6_sockglue.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index 7d9391506856..759fbf96515b 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -1035,7 +1035,8 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
put_cmsg(&msg, SOL_IPV6, IPV6_2292HOPLIMIT, sizeof(hlim), &hlim);
}
if (np->rxopt.bits.rxflow) {
- int flowinfo = np->rcv_flowinfo;
+ __be32 flowinfo = np->rcv_flowinfo;
+
put_cmsg(&msg, SOL_IPV6, IPV6_FLOWINFO, sizeof(flowinfo), &flowinfo);
}
}