1. 17 Jul, 2014 19 commits
  2. 16 Jul, 2014 19 commits
  3. 15 Jul, 2014 2 commits
    • Nikolay Aleksandrov's avatar
      bonding: fix bond_option_mode_set warning · ff11d8b2
      Nikolay Aleksandrov authored
      
      
      During the conversion to "static" functions this one got left out, only its
      prototype was converted, thus resulting in:
      drivers/net/bonding//bond_options.c:674:5: warning: symbol
      'bond_option_mode_set' was not declared. Should it be static?
      
      Fix it by making it static and also break the line in two as it was too
      long.
      
      CC: Stephen Hemminger <stephen@networkplumber.org>
      CC: Jay Vosburgh <j.vosburgh@gmail.com>
      CC: Veaceslav Falico <vfalico@gmail.com>
      CC: Andy Gospodarek <andy@greyhouse.net>
      CC: David S. Miller <davem@davemloft.net>
      Signed-off-by: default avatarNikolay Aleksandrov <nikolay@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ff11d8b2
    • Veaceslav Falico's avatar
      bonding: permit enslaving interfaces without set_mac support · f5442441
      Veaceslav Falico authored
      
      
      Currently we exit if the slave isn't the first slave, doesn't support mac
      address setting and fail_over_mac isn't FOM_ACTIVE. It's wrong because we
      only require ndo_set_mac_address in case bonding is in active-backup mode
      and FOM isn't FOM_ACTIVE.
      
      To fix this - only exit with an error if we're in a/b mode and have
      fail_over_mac != FOM_ACTIVE.
      
      Also, maintain current behaviour on the first slave (forcibly change fom to
      FOM_ACTIVE) to not break anyone's configuration.
      
      CC: Jay Vosburgh <j.vosburgh@gmail.com>
      CC: Andy Gospodarek <andy@greyhouse.net>
      Signed-off-by: default avatarVeaceslav Falico <vfalico@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f5442441