diff options
| author | Tony Lindgren <tony@atomide.com> | 2014-03-02 17:22:03 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2014-03-02 17:22:03 -0500 |
| commit | f777ba1780584b100ab9664cc06d04f3bb273a84 (patch) | |
| tree | 865813eb0078530ca3b036c0c3eee6ce33f9315f /net/core/rtnetlink.c | |
| parent | f68e355c86cff91e5266cf937ea24fcba0641900 (diff) | |
| parent | 1a5fe3ca5ea192d4309dd61f3626b79ff38693c2 (diff) | |
Merge tag 'for_3.15/dts_signed' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.15/dt
Add craneboard devices
Add more N900 devices
Add am43x-epos-evm and am437x-gp-evm devices
Add OMAP4 DMM devices
Conflicts:
arch/arm/boot/dts/am43x-epos-evm.dts
arch/arm/boot/dts/dra7.dtsi
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 393b1bc9a618..048dc8d183aa 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c | |||
| @@ -374,7 +374,7 @@ static size_t rtnl_link_get_slave_info_data_size(const struct net_device *dev) | |||
| 374 | if (!master_dev) | 374 | if (!master_dev) |
| 375 | return 0; | 375 | return 0; |
| 376 | ops = master_dev->rtnl_link_ops; | 376 | ops = master_dev->rtnl_link_ops; |
| 377 | if (!ops->get_slave_size) | 377 | if (!ops || !ops->get_slave_size) |
| 378 | return 0; | 378 | return 0; |
| 379 | /* IFLA_INFO_SLAVE_DATA + nested data */ | 379 | /* IFLA_INFO_SLAVE_DATA + nested data */ |
| 380 | return nla_total_size(sizeof(struct nlattr)) + | 380 | return nla_total_size(sizeof(struct nlattr)) + |