diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-08-18 20:16:53 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-18 20:16:53 -0700 |
| commit | 1c8aa215ec060f5df64ff99b088e8a97f45efb0b (patch) | |
| tree | a7bb3d703f97f3c622fc25235cbac2341210d0cd /include | |
| parent | hv_netvsc: Fix dereference of nvdev before check (diff) | |
| parent | vrf: simplify the netdev notifier function (diff) | |
Merge branch 'vrf-next'
Nikolay Aleksandrov says:
====================
vrf: a few simplifications and cleanups
These patches remove some unnecessary checks (patches 3, 4), unnecessary
num_slaves member and refcnt manipulations which are already done by the
upper functions.
====================
Acked-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/vrf.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/vrf.h b/include/net/vrf.h index 40e3793c7a05..3bb4af462ed6 100644 --- a/include/net/vrf.h +++ b/include/net/vrf.h @@ -24,7 +24,6 @@ struct slave { struct slave_queue { struct list_head all_slaves; - int num_slaves; }; struct net_vrf { |