1. 03 12月, 2015 5 次提交
  2. 02 12月, 2015 32 次提交
  3. 01 12月, 2015 3 次提交
    • D
      Merge branch 'ipmr-nl' · 75c4a57c
      David S. Miller 提交于
      Nikolay Aleksandrov says:
      
      ====================
      net: ipmr: more cleanups and mfc netlink support
      
      This set continues with the minor cleanups in the first 6 patches and
      patch 7 adds the first new feature - MFC manipulation via netlink. It
      registers NEWROUTE/DELROUTE for that purpose and uses the same semantics
      as the already present netlink dump. The only new attribute that is used
      is RTA_PREFSRC to denote an MFC_PROXY entry. Currently the table must
      exist before adding an entry, and new tables can be created only via
      setsockopt, but that will be changed in the future.
      This set was tested with modified iproute2 which supports NEWROUTE/DELROUTE
      for RTNL_FAMILY_IPMR.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      75c4a57c
    • N
      net: ipmr: add mfc newroute/delroute netlink support · ccbb0aa6
      Nikolay Aleksandrov 提交于
      This patch adds support to add and remove MFC entries. It uses the
      same attributes like the already present dump support in order to be
      consistent. There's one new entry - RTA_PREFSRC, it's used to denote an
      MFC_PROXY entry (see MRT_ADD_MFC vs MRT_ADD_MFC_PROXY).
      The already existing infrastructure is used to create and delete the
      entries, the netlink message gets converted internally to a struct mfcctl
      which is used with ipmr_mfc_add/delete.
      The other used attributes are:
      RTA_IIF - used for mfcc_parent (when adding it's required to be valid)
      RTA_SRC - used for mfcc_origin
      RTA_DST - used for mfcc_mcastgrp
      RTA_TABLE - the MRT table id
      RTA_MULTIPATH - the "oifs" ttl array
      Signed-off-by: NNikolay Aleksandrov <nikolay@cumulusnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ccbb0aa6
    • N
      net: ipmr: fix setsockopt error return · 42e6b89c
      Nikolay Aleksandrov 提交于
      We can have both errors and we'll return the second one, fix it to
      return an error at a time as it's normal. I've overlooked this in my
      previous set.
      Signed-off-by: NNikolay Aleksandrov <nikolay@cumulusnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      42e6b89c