summaryrefslogtreecommitdiffstats
path: root/net/xfrm/xfrm_algo.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-01-12 22:47:13 +0100
committerDavid S. Miller <davem@davemloft.net>2015-01-12 22:47:13 +0100
commitd0d2cc53a058cc3768e3dc0d6e5e3fae0d944363 (patch)
tree21c9371b647f80c8d632f721b6b9e4f721240c98 /net/xfrm/xfrm_algo.c
parentdrivers: net: xen-netfront: remove residual dead code (diff)
parentbridge: new function to pack vlans into ranges during gets (diff)
downloadlinux-d0d2cc53a058cc3768e3dc0d6e5e3fae0d944363.tar.xz
linux-d0d2cc53a058cc3768e3dc0d6e5e3fae0d944363.zip
Merge branch 'bridge_vlan_ranges'
Roopa Prabhu says: ==================== bridge: support for vlan range in setlink/dellink This series adds new flags in IFLA_BRIDGE_VLAN_INFO to indicate vlan range. Will post corresponding iproute2 patches if these get accepted. v1-> v2 - changed patches to use a nested list attribute IFLA_BRIDGE_VLAN_INFO_LIST as suggested by scott feldman - dropped notification changes from the series. Will post them separately after this range message is accepted. v2 -> v3 - incorporated some review feedback - include patches to fill vlan ranges during getlink - Dropped IFLA_BRIDGE_VLAN_INFO_LIST. I think it may get confusing to userspace if we introduce yet another way to send lists. With getlink already sending nested IFLA_BRIDGE_VLAN_INFO in IFLA_AF_SPEC, It seems better to use the existing format for lists and just use the flags from v2 to mark vlan ranges ==================== Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com> Signed-off-by: Wilson Kok <wkok@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm/xfrm_algo.c')
0 files changed, 0 insertions, 0 deletions