diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-09-08 11:14:56 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-09-08 11:14:56 -0400 |
| commit | 61a3d4f9d52c00b2016bc27fc66b10a194043f76 (patch) | |
| tree | 938a7bd50bbef0215a20dfec99007b4c30828019 /include/net/netns | |
| parent | db906eb2101b0564b0c65edf4a8647395196342e (diff) | |
| parent | 1bd3fa7b8c9b2936c16c6e6452f9cc991c405872 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'include/net/netns')
| -rw-r--r-- | include/net/netns/ieee802154_6lowpan.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/netns/ieee802154_6lowpan.h b/include/net/netns/ieee802154_6lowpan.h index e2070960bac0..8170f8d7052b 100644 --- a/include/net/netns/ieee802154_6lowpan.h +++ b/include/net/netns/ieee802154_6lowpan.h | |||
| @@ -16,7 +16,6 @@ struct netns_sysctl_lowpan { | |||
| 16 | struct netns_ieee802154_lowpan { | 16 | struct netns_ieee802154_lowpan { |
| 17 | struct netns_sysctl_lowpan sysctl; | 17 | struct netns_sysctl_lowpan sysctl; |
| 18 | struct netns_frags frags; | 18 | struct netns_frags frags; |
| 19 | int max_dsize; | ||
| 20 | }; | 19 | }; |
| 21 | 20 | ||
| 22 | #endif | 21 | #endif |