linux.git/include/linux/netdevice.h, branch v2.6.26-rc2

[NETNS]: Add netns refcnt debug for network devices.

2008-04-16T09:02:18+00:00

dev_set_net is called for
- just allocated devices
- devices moving from one namespace to another
release_net has proper check inside to distinguish these cases.

Signed-off-by: Denis V. Lunev 
Signed-off-by: David S. Miller

[NETNS]: Declare init_net even without CONFIG_NET defined.

2008-04-03T20:04:33+00:00

This does not look good, but there is no other choice. The compilation
without CONFIG_NET is broken and can not be fixed with ease.

After that there is no need for the following commits:
1567ca7eec7664b8be3b07755ac59dc1b1ec76cb
3edf8fa5ccf10688a9280b5cbca8ed3947c42866
2d38f9a4f8d2ebdc799f03eecf82345825495711

Revert them.

Signed-off-by: Denis V. Lunev 
Signed-off-by: David S. Miller

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2008-04-03T05:35:23+00:00

Conflicts:

	drivers/net/s2io.c

[NET]: Fix allnoconfig build on powerpc and avr32

2008-03-31T07:28:14+00:00

As reported by Haavard Skinnemoen and Stephen Rothwell:

> allnoconfig fails with
>
> include/linux/netdevice.h:843: error: implicit declaration of function 'dev_net'
>
> which seems to be because the definition of dev_net is inside #ifdef
> CONFIG_NET, while next_net_device, which calls it, is not.

Signed-off-by: David S. Miller

net: Comment dev_kfree_skb_irq and dev_kfree_skb_any better

2008-03-28T23:33:00+00:00

Comment dev_kfree_skb_irq and dev_kfree_skb_any better.

Signed-off-by: Matti Linnanvuori 
Signed-off-by: David S. Miller

[NET]: Protect device namespace inlines with CONFIG_NET

2008-03-28T22:53:11+00:00

Include sites should not be bothered by whether
CONFIG_NET is set or not when trying to include
benign files like linux/etherdevice.h et al.

From a report by Stephen Rothwell.

Signed-off-by: David S. Miller

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2008-03-28T01:48:56+00:00

Conflicts:

	drivers/net/usb/rndis_host.c
	drivers/net/wireless/b43/dma.c
	net/ipv6/ndisc.c

[NET]: Use local_irq_{save,restore}() in napi_complete().

2008-03-28T00:42:50+00:00

Based upon a lockdep report.

Since ->poll() can be invoked from netpoll with interrupts
disabled, we must not unconditionally enable interrupts
in napi_complete().

Instead we must use local_irq_{save,restore}().

Noticed by Peter Zijlstra:



  netpoll_poll()
    poll_napi()
      spin_trylock(&napi->poll_lock)
      poll_one_napi()
        napi->poll() := sky2_poll()
          napi_complete()
            local_irq_disable()
            local_irq_enable() <--- *BUG*

  
    irq_exit()
      do_softirq()
        net_rx_action()
          spin_lock(&napi->poll_lock) <--- Deadlock!

Because we still hold the lock....

Signed-off-by: David S. Miller

[NETNS]: Compilation warnings under CONFIG_NET_NS.

2008-03-26T07:48:17+00:00

Recent commits from YOSHIFUJI Hideaki 
have been introduced a several compilation warnings
'assignment discards qualifiers from pointer target type'
due to extra const modifier in the inline call parameters of
{dev|sock|twsk}_net_set.

Drop it.

Signed-off-by: Denis V. Lunev 
Signed-off-by: David S. Miller

[NETNS]: Compilation fix for include/linux/netdevice.h.

2008-03-26T07:47:14+00:00

Commit commit c346dca10840a874240c78efe3f39acf4312a1f2
([NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS)
breaks compilation with CONFIG_NET_NS set.

Fix the typo.

Signed-off-by: Denis V. Lunev 
Signed-off-by: David S. Miller