1. 18 Jan, 2015 2 commits
    • Roopa Prabhu's avatar
      bridge: fix setlink/dellink notifications · 02dba438
      Roopa Prabhu authored
      problems with bridge getlink/setlink notifications today:
              - bridge setlink generates two notifications to userspace
                      - one from the bridge driver
                      - one from rtnetlink.c (rtnl_bridge_notify)
              - dellink generates one notification from rtnetlink.c. Which
      	means bridge setlink and dellink notifications are not
      	consistent
      
              - Looking at the code it appears,
      	If both BRIDGE_FLAGS_MASTER and BRIDGE_FLAGS_SELF were set,
              the size calculation in rtnl_bridge_notify can be wrong.
              Example: if you set both BRIDGE_FLAGS_MASTER and BRIDGE_FLAGS_SELF
              in a setlink request to rocker dev, rtnl_bridge_notify will
      	allocate skb for one set of bridge attributes, but,
      	both the bridge driver and rocker dev will try to add
      	attributes resulting in twice the number of attributes
      	being added to the skb.  (rocker dev calls ndo_dflt_bridge_getlink)
      
      There are multiple options:
      1) Generate one notification including all attributes from master and self:
         But, I don't think it will work, because both master and self may use
         the same attributes/policy. Cannot pack the same set of attributes in a
         single notification from both master and slave (duplicate attributes).
      
      2) Generate one notification from master and the other notification from
         self (This seems to be ideal):
           For master: the master driver will send notification (bridge in this
      	example)
           For self: the self driver will send notification (rocker in the above
      	example. It can use helpers from rtnetlink.c to do so. Like the
      	ndo_dflt_bridge_getlink api).
      
      This patch implements 2) (leaving the 'rtnl_bridge_notify' around to be used
      with 'self').
      
      v1->v2 :
      	- rtnl_bridge_notify is now called only for self,
      	so, remove 'BRIDGE_FLAGS_SELF' check and cleanup a few things
      	- rtnl_bridge_dellink used to always send a RTM_NEWLINK msg
      	earlier. So, I have changed the notification from br_dellink to
      	go as RTM_NEWLINK
      Signed-off-by: default avatarRoopa Prabhu <roopa@cumulusnetworks.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      02dba438
    • David S. Miller's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next · 1e7d06ba
      David S. Miller authored
      Jeff Kirsher says:
      
      ====================
      Intel Wired LAN Driver Updates 2015-01-16
      
      This series contains updates to i40e and i40evf.
      
      This series is a little bit larger than normal because two of the patches are
      version bumps.
      
      Shannon provides tweaks to i40e and i40evf to keep the firmware, software
      and silicon validation in line together by removing unused and
      deprecated code, adding define for iSCSI and fix queue mask size.  Fix
      i40e so we do not give up in the reset/rebuild process if DCB setup
      fails, just handle it the same as in the probe setup.  Cleans up PTP
      log messages by removing the use of __func__ as we are not using that
      any longer and removes the netdev name, since that can change and can
      be misleading.  Adds struct size checks to indirect and command
      structs that were left out previously.  Added admin queue API updates
      (LLDP control, OEM OCSD and OCBB commands).
      
      Kevin increases ASQ timeout for scenarios with multi-function devices.
      
      Carolyn fixes a problem where the interrupts descriptions from the MSIx
      configuration were truncating the needed bus info, which makes it hard
      to distinguish configurations from port to port.  Increased the string
      buffer size in order to allow the full data to be displayed.
      
      Sravanthi cleans up the dump stats string from debugfs.
      
      Jacob updates i40e to only enable the PTP interrupt in PFs which have PTP
      enabled, instead of blindly enabling the PTP interrupt flags for all PFs.
      Also updated i40e so that we do not do Tx or Rx timestamps if we do not
      have PTP enabled.  Added the same check against pf->ptp_rx as we have
      in Rx timestamp code path because it is possible that the user can
      configure only Tx hardware timestamping so we do not want to check for
      Rx timestamp hang since the software won't be handling them.
      
      Neerav updates the driver to disable firmware LLDP agent for NICs with
      a firmware version lower than v4.3 and added a message when this happens.
      Adds parsing and reporting of iSCSI capability for a given device or
      function, as well as adding support for iSCSI partition type with DCB
      in NPAR mode.
      
      v2:
       - Dropped patch 10 "i40e: clean up PTP log messages" based on feedback
         from David Laight and David Miller
       - Split up the original patch 13 "i40e: AQ API updates for new commands"
         into 2 patches (now #12 & #13) based on feedback from Or Gerlitz
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1e7d06ba
  2. 17 Jan, 2015 13 commits
  3. 16 Jan, 2015 25 commits