1. 27 Mar, 2013 29 commits
  2. 26 Mar, 2013 11 commits
    • Tony Cheneau's avatar
    • Tony Cheneau's avatar
      6lowpan: fix a small formatting issue · ababf385
      Tony Cheneau authored
      This formatting issue was introduced with commit
      d4ac3236
      
      Signed-off-by: default avatarTony Cheneau <tony.cheneau@amnesiak.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ababf385
    • stefan@datenfreihafen.org's avatar
      ieee802154/at86rf230: Fix register names for RX_AACK_ON and TX_ARET_ON · 028889b0
      stefan@datenfreihafen.org authored
      
      
      The register names have been wrong since the beginning but it only showed up now
      as they are actualy used for the upcoming auto ACK support.
      Signed-off-by: default avatarStefan Schmidt <stefan@datenfreihafen.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      028889b0
    • stefan@datenfreihafen.org's avatar
      ieee802154/at86rf230: Implement hardware address filter callback. · 1486774d
      stefan@datenfreihafen.org authored
      
      
      Implement the filter function to update short address, pan id and ieee
      address on change. Allowing for hardware address filtering needed for
      auto ACK.
      Signed-off-by: default avatarStefan Schmidt <stefan@datenfreihafen.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1486774d
    • Stephen Röttger's avatar
      ieee802154/dgram: Pass source address in dgram_recvmsg · 6364e6ee
      Stephen Röttger authored
      
      
      This patch lets dgram_recvmsg fill in the sockaddr struct in
      msg->msg_name with the source address of the packet.
      This is used by the userland functions recvmsg and recvfrom to get the
      senders address.
      
      [Stefan: Changed from old zigbee legacy tree to mainline]
      Signed-off-by: default avatarStephen Röttger <stephen.roettger@zero-entropy.de>
      Signed-off-by: default avatarStefan Schmidt <stefan@datenfreihafen.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6364e6ee
    • Pravin B Shelar's avatar
      VXLAN: Fix sparse warnings. · 5abb0029
      Pravin B Shelar authored
      
      
      Fixes following warning:-
      drivers/net/vxlan.c:471:35: warning: symbol 'dev' shadows an earlier one
      drivers/net/vxlan.c:433:26: originally declared here
      drivers/net/vxlan.c:794:34: warning: symbol 'vxlan' shadows an earlier one
      drivers/net/vxlan.c:757:26: originally declared here
      
      CC: Stephen Hemminger <stephen@networkplumber.org>
      Signed-off-by: default avatarPravin B Shelar <pshelar@nicira.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      5abb0029
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · de55eb1d
      Linus Torvalds authored
      Pull vfs fixes from Al Viro:
       "stable fodder; assorted deadlock fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        vt: synchronize_rcu() under spinlock is not nice...
        Nest rename_lock inside vfsmount_lock
        Don't bother with redoing rw_verify_area() from default_file_splice_from()
      de55eb1d
    • Al Viro's avatar
      vt: synchronize_rcu() under spinlock is not nice... · e8cd8169
      Al Viro authored
      
      
      vcs_poll_data_free() calls unregister_vt_notifier(), which calls
      atomic_notifier_chain_unregister(), which calls synchronize_rcu().
      Do it *after* we'd dropped ->f_lock.
      
      Cc: stable@vger.kernel.org (all kernels since 2.6.37)
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      e8cd8169
    • Al Viro's avatar
      Nest rename_lock inside vfsmount_lock · 7ea600b5
      Al Viro authored
      
      
      ... lest we get livelocks between path_is_under() and d_path() and friends.
      
      The thing is, wrt fairness lglocks are more similar to rwsems than to rwlocks;
      it is possible to have thread B spin on attempt to take lock shared while thread
      A is already holding it shared, if B is on lower-numbered CPU than A and there's
      a thread C spinning on attempt to take the same lock exclusive.
      
      As the result, we need consistent ordering between vfsmount_lock (lglock) and
      rename_lock (seq_lock), even though everything that takes both is going to take
      vfsmount_lock only shared.
      Spotted-by: default avatarBrad Spengler <spender@grsecurity.net>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      7ea600b5
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · b175293c
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Always increment IPV4 ID field in encapsulated GSO packets, even
          when DF is set.  Regression fix from Pravin B Shelar.
      
       2) Fix per-net subsystem initialization in netfilter conntrack,
          otherwise we may access dynamically allocated memory before it is
          actually allocated.  From Gao Feng.
      
       3) Fix DMA buffer lengths in iwl3945 driver, from Stanislaw Gruszka.
      
       4) Fix race between submission of sync vs async commands in mwifiex
          driver, from Amitkumar Karwar.
      
       5) Add missing cancel of command timer in mwifiex driver, from Bing
          Zhao.
      
       6) Missing SKB free in rtlwifi USB driver, from Jussi Kivilinna.
      
       7) Thermal layer tries to use a genetlink multicast string that is
          longer than the 16 character limit.  Fix it and add a BUG check to
          prevent this kind of thing from happening in the future.
      
       From Masatake YAMATO.
      
       8) Fix many bugs in the handling of the teardown of L2TP connections,
          UDP encapsulation instances, and sockets.  From Tom Parkin.
      
       9) Missing socket release in IRDA, from Kees Cook.
      
      10) Fix fec driver modular build, from Fabio Estevam.
      
      11) Erroneous use of kfree() instead of free_netdev() in lantiq_etop,
          from Wei Yongjun.
      
      12) Fix bugs in handling of queue numbers and steering rules in mlx4
          driver, from Moshe Lazer, Hadar Hen Zion, and Or Gerlitz.
      
      13) Some FOO_DIAG_MAX constants were defined off by one, fix from Andrey
          Vagin.
      
      14) TCP segmentation deferral is unintentionally done too strongly,
          breaking ACK clocking.  Fix from Eric Dumazet.
      
      15) net_enable_timestamp() can legitimately be invoked from software
          interrupts, and in a way that is safe, so remove the WARN_ON().
          Also from Eric Dumazet.
      
      16) Fix use after free in VLANs, from Cong Wang.
      
      17) Fix TCP slow start retransmit storms after SACK reneging, from
          Yuchung Cheng.
      
      18) Unix socket release should mark a socket dead before NULL'ing out
          sock->sk, otherwise we can race.  Fix from Paul Moore.
      
      19) IPV6 addrconf code can try to free static memory, from Hong Zhiguo.
      
      20) Fix register mis-programming, NULL pointer derefs, and wrong PHC
          clock frequency in IGB driver.  From Lior LevyAlex Williamson, Jiri
          Benc, and Jeff Kirsher.
      
      21) skb->ip_summed logic in pch_gbe driver is reversed, breaking packet
          forwarding.  Fix from Veaceslav Falico.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (65 commits)
        ipv4: Fix ip-header identification for gso packets.
        bonding: remove already created master sysfs link on failure
        af_unix: dont send SCM_CREDENTIAL when dest socket is NULL
        pch_gbe: fix ip_summed checksum reporting on rx
        igb: fix PHC stopping on max freq
        igb: make sensor info static
        igb: SR-IOV init reordering
        igb: Fix null pointer dereference
        igb: fix i350 anti spoofing config
        ixgbevf: don't release the soft entries
        ipv6: fix bad free of addrconf_init_net
        unix: fix a race condition in unix_release()
        tcp: undo spurious timeout after SACK reneging
        bnx2x: fix assignment of signed expression to unsigned variable
        bridge: fix crash when set mac address of br interface
        8021q: fix a potential use-after-free
        net: remove a WARN_ON() in net_enable_timestamp()
        tcp: preserve ACK clocking in TSO
        net: fix *_DIAG_MAX constants
        net/mlx4_core: Disallow releasing VF QPs which have steering rules
        ...
      b175293c
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-3.9-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 5d538483
      Linus Torvalds authored
      Pull NFS client bugfixes from Trond Myklebust:
       - Fix an NFSv4 idmapper regression
       - Fix an Oops in the pNFS blocks client
       - Fix up various issues with pNFS layoutcommit
       - Ensure correct read ordering of variables in
         rpc_wake_up_task_queue_locked
      
      * tag 'nfs-for-3.9-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        SUNRPC: Add barriers to ensure read ordering in rpc_wake_up_task_queue_locked
        NFSv4.1: Add a helper pnfs_commit_and_return_layout
        NFSv4.1: Always clear the NFS_INO_LAYOUTCOMMIT in layoutreturn
        NFSv4.1: Fix a race in pNFS layoutcommit
        pnfs-block: removing DM device maybe cause oops when call dev_remove
        NFSv4: Fix the string length returned by the idmapper
      5d538483