diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 16:41:21 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 16:41:21 (GMT) |
| commit | 8dbd2879e33be37adf40f747a5fb80ef1a6cd150 (patch) | |
| tree | c688d7980be8c1c0dbf5e411caaf2c102120102e /net/ipv4/tcp_metrics.c | |
| parent | b770ea523d95837e968d46c7fe09a3f5edd9bb27 (diff) | |
| parent | d308ba50a1234b299a00e63a95e61fdeb2f1a2df (diff) | |
| download | linux-fsl-qoriq-8dbd2879e33be37adf40f747a5fb80ef1a6cd150.tar.xz | |
Merge branch 'omap/dt' into next/drivers
Needed for the omap timer changes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'net/ipv4/tcp_metrics.c')
| -rw-r--r-- | net/ipv4/tcp_metrics.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_metrics.c b/net/ipv4/tcp_metrics.c index 4c752a6..53bc584 100644 --- a/net/ipv4/tcp_metrics.c +++ b/net/ipv4/tcp_metrics.c @@ -864,7 +864,7 @@ static int parse_nl_addr(struct genl_info *info, struct inetpeer_addr *addr, } a = info->attrs[TCP_METRICS_ATTR_ADDR_IPV6]; if (a) { - if (nla_len(a) != sizeof(sizeof(struct in6_addr))) + if (nla_len(a) != sizeof(struct in6_addr)) return -EINVAL; addr->family = AF_INET6; memcpy(addr->addr.a6, nla_data(a), sizeof(addr->addr.a6)); |