1. 22 1月, 2014 24 次提交
  2. 20 1月, 2014 9 次提交
  3. 19 1月, 2014 3 次提交
  4. 18 1月, 2014 4 次提交
    • S
      Bluetooth: remove direct compilation of 6lowpan_iphc.c · c9151497
      Stephen Warren 提交于
      It's now built as a separate utility module, and enabling BT selects
      that module in Kconfig. This fixes:
      
      net/ieee802154/built-in.o:(___ksymtab_gpl+lowpan_process_data+0x0): multiple definition of `__ksymtab_lowpan_process_data'
      net/bluetooth/built-in.o:(___ksymtab_gpl+lowpan_process_data+0x0): first defined here
      net/ieee802154/built-in.o:(___ksymtab_gpl+lowpan_header_compress+0x0): multiple definition of `__ksymtab_lowpan_header_compress'
      net/bluetooth/built-in.o:(___ksymtab_gpl+lowpan_header_compress+0x0): first defined here
      net/ieee802154/built-in.o: In function `lowpan_header_compress':
      net/ieee802154/6lowpan_iphc.c:606: multiple definition of `lowpan_header_compress'
      net/bluetooth/built-in.o:/home/swarren/shared/git_wa/kernel/kernel.git/net/bluetooth/../ieee802154/6lowpan_iphc.c:606: first defined here
      net/ieee802154/built-in.o: In function `lowpan_process_data':
      net/ieee802154/6lowpan_iphc.c:344: multiple definition of `lowpan_process_data'
      net/bluetooth/built-in.o:/home/swarren/shared/git_wa/kernel/kernel.git/net/bluetooth/../ieee802154/6lowpan_iphc.c:344: first defined here
      make[1]: *** [net/built-in.o] Error 1
      
      (this change probably simply wasn't "git add"d to a53d34c3)
      
      Fixes: a53d34c3 ("net: move 6lowpan compression code to separate module")
      Fixes: 18722c24 ("Bluetooth: Enable 6LoWPAN support for BT LE devices")
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      Acked-by: NRandy Dunlap <rdunlap@infradead.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c9151497
    • S
      Bluetooth: remove direct compilation of 6lowpan_iphc.c · 7bbc084c
      Stephen Warren 提交于
      It's now built as a separate utility module, and enabling BT selects
      that module in Kconfig. This fixes:
      
      net/ieee802154/built-in.o:(___ksymtab_gpl+lowpan_process_data+0x0): multiple definition of `__ksymtab_lowpan_process_data'
      net/bluetooth/built-in.o:(___ksymtab_gpl+lowpan_process_data+0x0): first defined here
      net/ieee802154/built-in.o:(___ksymtab_gpl+lowpan_header_compress+0x0): multiple definition of `__ksymtab_lowpan_header_compress'
      net/bluetooth/built-in.o:(___ksymtab_gpl+lowpan_header_compress+0x0): first defined here
      net/ieee802154/built-in.o: In function `lowpan_header_compress':
      net/ieee802154/6lowpan_iphc.c:606: multiple definition of `lowpan_header_compress'
      net/bluetooth/built-in.o:/home/swarren/shared/git_wa/kernel/kernel.git/net/bluetooth/../ieee802154/6lowpan_iphc.c:606: first defined here
      net/ieee802154/built-in.o: In function `lowpan_process_data':
      net/ieee802154/6lowpan_iphc.c:344: multiple definition of `lowpan_process_data'
      net/bluetooth/built-in.o:/home/swarren/shared/git_wa/kernel/kernel.git/net/bluetooth/../ieee802154/6lowpan_iphc.c:344: first defined here
      make[1]: *** [net/built-in.o] Error 1
      
      (this change probably simply wasn't "git add"d to a53d34c3)
      
      Fixes: a53d34c3 ("net: move 6lowpan compression code to separate module")
      Fixes: 18722c24 ("Bluetooth: Enable 6LoWPAN support for BT LE devices")
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      Acked-by: NRandy Dunlap <rdunlap@infradead.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7bbc084c
    • S
      bonding: add netlink attributes to slave link dev · 1d3ee88a
      sfeldma@cumulusnetworks.com 提交于
      If link is IFF_SLAVE, extend link dev netlink attributes to include
      slave attributes with new IFLA_SLAVE nest.  Add netlink notification
      (RTM_NEWLINK) when slave status changes from backup to active, or
      visa-versa.
      
      Adds new ndo_get_slave op to net_device_ops to fill skb with IFLA_SLAVE
      attributes.  Currently only used by bonding driver, but could be
      used by other aggregating devices with slaves.
      Signed-off-by: NScott Feldman <sfeldma@cumulusnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      1d3ee88a
    • E
      ipv4: fix a dst leak in tunnels · 6c7e7610
      Eric Dumazet 提交于
      This patch :
      
      1) Remove a dst leak if DST_NOCACHE was set on dst
         Fix this by holding a reference only if dst really cached.
      
      2) Remove a lockdep warning in __tunnel_dst_set()
          This was reported by Cong Wang.
      
      3) Remove usage of a spinlock where xchg() is enough
      
      4) Remove some spurious inline keywords.
         Let compiler decide for us.
      
      Fixes: 7d442fab ("ipv4: Cache dst in tunnels")
      Signed-off-by: NEric Dumazet <edumazet@google.com>
      Cc: Cong Wang <cwang@twopensource.com>
      Cc: Tom Herbert <therbert@google.com>
      Cc: Maciej Żenczykowski <maze@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6c7e7610