diff options
| author | Benoit Cousson <benoit.cousson@linaro.org> | 2013-04-09 00:11:05 +0200 |
|---|---|---|
| committer | Benoit Cousson <benoit.cousson@linaro.org> | 2013-04-09 00:11:05 +0200 |
| commit | 5852264f9d6139751796853fdfca9d5230cbfb97 (patch) | |
| tree | 6e304184c9f725d83e582a731fbc727f9a41c343 /net/core/rtnetlink.c | |
| parent | 2e5f78aeceb6f203b514ca03a48e3fd056025524 (diff) | |
| parent | 469d633d20c774ecd34ac615c838193e1e150c62 (diff) | |
Merge tag 'omap-devel-b-for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into for_3.10/dts_merged
Diffstat (limited to 'net/core/rtnetlink.c')
| -rw-r--r-- | net/core/rtnetlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index a585d45cc9d..5fb8d7e4729 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -2621,7 +2621,7 @@ static int rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) struct rtattr *attr = (void *)nlh + NLMSG_ALIGN(min_len); while (RTA_OK(attr, attrlen)) { - unsigned int flavor = attr->rta_type; + unsigned int flavor = attr->rta_type & NLA_TYPE_MASK; if (flavor) { if (flavor > rta_max[sz_idx]) return -EINVAL; |