diff options
| author | David S. Miller <davem@davemloft.net> | 2013-10-08 23:07:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-10-08 23:07:53 -0400 |
| commit | 53af53ae83fe960ceb9ef74cac7915e9088f4266 (patch) | |
| tree | 0cd5309f2a931d3f210aa3d2025aae64f2276e8c /net/8021q | |
| parent | b343ca84b4e3ba65508503333c923a797801a588 (diff) | |
| parent | 9684d7b0dab3cf3a897edd85dca501d413888d56 (diff) | |
| download | op-kernel-dev-53af53ae83fe960ceb9ef74cac7915e9088f4266.zip op-kernel-dev-53af53ae83fe960ceb9ef74cac7915e9088f4266.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
include/linux/netdevice.h
net/core/sock.c
Trivial merge issues.
Removal of "extern" for functions declaration in netdevice.h
at the same time "const" was added to an argument.
Two parallel line additions in net/core/sock.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q')
| -rw-r--r-- | net/8021q/vlan_netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c index 3091297..c7e634a 100644 --- a/net/8021q/vlan_netlink.c +++ b/net/8021q/vlan_netlink.c @@ -171,7 +171,7 @@ static size_t vlan_get_size(const struct net_device *dev) return nla_total_size(2) + /* IFLA_VLAN_PROTOCOL */ nla_total_size(2) + /* IFLA_VLAN_ID */ - sizeof(struct ifla_vlan_flags) + /* IFLA_VLAN_FLAGS */ + nla_total_size(sizeof(struct ifla_vlan_flags)) + /* IFLA_VLAN_FLAGS */ vlan_qos_map_size(vlan->nr_ingress_mappings) + vlan_qos_map_size(vlan->nr_egress_mappings); } |
