1. 29 1月, 2013 8 次提交
    • C
      netpoll: use the net namespace of current process instead of init_net · 556e6256
      Cong Wang 提交于
      This will allow us to setup netconsole in a different namespace
      rather than where init_net is.
      
      Cc: Eric W. Biederman <ebiederm@xmission.com>
      Cc: David S. Miller <davem@davemloft.net>
      Signed-off-by: NCong Wang <amwang@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      556e6256
    • C
      netpoll: use ipv6_addr_equal() to compare ipv6 addr · faeed828
      Cong Wang 提交于
      ipv6_addr_equal() is faster.
      
      Cc: David S. Miller <davem@davemloft.net>
      Signed-off-by: NCong Wang <amwang@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      faeed828
    • C
      netpoll: add RCU annotation to npinfo field · 5fbee843
      Cong Wang 提交于
      dev->npinfo is protected by RCU.
      
      This fixes the following sparse warnings:
      
      net/core/netpoll.c:177:48: error: incompatible types in comparison expression (different address spaces)
      net/core/netpoll.c:200:35: error: incompatible types in comparison expression (different address spaces)
      net/core/netpoll.c:221:35: error: incompatible types in comparison expression (different address spaces)
      net/core/netpoll.c:327:18: error: incompatible types in comparison expression (different address spaces)
      
      Cc: Eric Dumazet <eric.dumazet@gmail.com>
      Cc: David S. Miller <davem@davemloft.net>
      Signed-off-by: NCong Wang <amwang@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      5fbee843
    • D
      Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next · ce4a600e
      David S. Miller 提交于
      John W. Linville says:
      
      ====================
      Included is an NFC pull.  Samuel says:
      
      "It brings the following goodies:
      
      - LLCP socket timestamping (To be used e.g with the recently released nfctool
        application for a more efficient skb timestamping when sniffing).
      - A pretty big pn533 rework from Waldemar, preparing the driver to support
        more flavours of pn533 based devices.
      - HCI changes from Eric in preparation for the microread driver support.
      - Some LLCP memory leak fixes, cleanups and slight improvements.
      - pn544 and nfcwilink move to the devm_kzalloc API.
      - An initial Secure Element (SE) API.
      - An nfc.h license change from the original author, allowing non GPL
        application code to safely include it."
      
      Also included are a pair of mac80211 pulls.  Johannes says:
      
      "We found two bugs in the previous code, so I'm sending you a pull
      request again this soon.
      
      This contains two regulatory bug fixes, some of Thomas's hwsim beacon
      timer work and a documentation fix from Bob."
      
      "Another pull request for mac80211-next. This time, I have a number of
      things, the patches are mostly self-explanatory. There are a few fixes
      from Felix and myself, and random cleanups & improvements. The biggest
      thing is the partial patchset from Marco preparing for mesh powersave."
      
      Additionally, there are a pair of iwlwifi pulls.  Johannes says:
      
      "For iwlwifi-next, I have a few cleanups/improvements as well as a few
      not very important fixes and more preparations for new devices."
      
      "Please pull a few updates for iwlwifi. These are just some cleanups and
      a debug improvement."
      
      On top of that, there is a slew of driver updates.  This includes
      brcmfmac, mwifiex, ath9k, carl9170, and mwl8k as well as a handful
      of others.  The bcma and ssb busses get some attention as well.
      Still, I don't see any big headliners here.
      
      Also included is a pull of the wireless tree, in order to resolve
      some merge conflicts.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ce4a600e
    • D
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next · 8a67b05d
      David S. Miller 提交于
      Jeff Kirsher says:
      
      ====================
      This series contains updates to e1000e, ixgbevf, igb and igbvf.
      Majority of the patches are code cleanups of e1000e where code
      is removed (Yeah!).  The other two e1000e patches are fixes.  The
      first is to fix the maximum frame size for 82579 devices.  The second
      fix is to resolve an issue with devices other than 82579 that suffer
      from dropped transactions on platforms with deep C-states when
      jumbo frames are enabled.
      
      The ixgbevf patch is to ensure that the driver fetches the correct,
      refreshed value for link status and speed when the values have changed.
      
      The igb and igbvf patches are a solution to an issue Stefan Assmann
      reported, where when the PF is up and igbvf is loaded, the MAC address
      is not generated using eth_hw_addr_random().
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      8a67b05d
    • O
      can: rework skb reserved data handling · 2bf3440d
      Oliver Hartkopp 提交于
      Added accessor and skb_reserve helpers for struct can_skb_priv.
      Removed pointless skb_headroom() check.
      Signed-off-by: NOliver Hartkopp <socketcan@hartkopp.net>
      CC: Marc Kleine-Budde <mkl@pengutronix.de>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      2bf3440d
    • J
      Merge branch 'master' of... · 4205e6ef
      John W. Linville 提交于
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
      4205e6ef
    • J
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless · 9ebea382
      John W. Linville 提交于
      Conflicts:
      	drivers/net/wireless/ath/ath9k/main.c
      	drivers/net/wireless/iwlwifi/dvm/tx.c
      9ebea382
  2. 28 1月, 2013 27 次提交
  3. 27 1月, 2013 5 次提交