1. 02 Dec, 2009 9 commits
  2. 30 Nov, 2009 29 commits
  3. 29 Nov, 2009 2 commits
    • Eric Dumazet's avatar
      pktgen: NUMA aware · 3291b9db
      Eric Dumazet authored
      pktgen threads are bound to given CPU, we can allocate memory for
      these threads in a NUMA aware way.
      
      After a pktgen session on two threads, we can check flows memory was
      allocated on right node, instead of a not related one.
      
      # grep pktgen_thread_write /proc/vmallocinfo
      0xffffc90007204000-0xffffc90007385000 1576960 pktgen_thread_write+0x3a4/0x6b0 [pktgen] pages=384 vmalloc N0=384
      0xffffc90007386000-0xffffc90007507000 1576960 pktgen_thread_write+0x3a4/0x6b0 [pktgen] pages=384 vmalloc N1=384
      Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3291b9db
    • David S. Miller's avatar
      Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 9b963e5d
      David S. Miller authored
      Conflicts:
      	drivers/ieee802154/fakehard.c
      	drivers/net/e1000e/ich8lan.c
      	drivers/net/e1000e/phy.c
      	drivers/net/netxen/netxen_nic_init.c
      	drivers/net/wireless/ath/ath9k/main.c
      9b963e5d