diff options
author | James Morris <james.l.morris@oracle.com> | 2014-09-30 18:44:04 +0400 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2014-09-30 18:44:04 +0400 |
commit | 6c8ff877cdf13cd5287ed9d700cfb6cb70e2bfa1 (patch) | |
tree | 2ab49b7d19fb69cdae5b6be9e7ba44f6cf3d45ef /include/net/netns/ieee802154_6lowpan.h | |
parent | 35e1efd25a9e7d5cf2884fa23441ab87353849bb (diff) | |
parent | 19583ca584d6f574384e17fe7613dfaeadcdc4a6 (diff) | |
download | linux-6c8ff877cdf13cd5287ed9d700cfb6cb70e2bfa1.tar.xz |
Merge commit 'v3.16' into next
Diffstat (limited to 'include/net/netns/ieee802154_6lowpan.h')
-rw-r--r-- | include/net/netns/ieee802154_6lowpan.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/netns/ieee802154_6lowpan.h b/include/net/netns/ieee802154_6lowpan.h index 079030c853d8..e2070960bac0 100644 --- a/include/net/netns/ieee802154_6lowpan.h +++ b/include/net/netns/ieee802154_6lowpan.h @@ -16,7 +16,7 @@ struct netns_sysctl_lowpan { struct netns_ieee802154_lowpan { struct netns_sysctl_lowpan sysctl; struct netns_frags frags; - u16 max_dsize; + int max_dsize; }; #endif |