Netdev List

Netdev List
 help / color / mirror / Atom feed

* Re: TCP port firewall incl. description and english variable names
From: Antonin Steinhauser @ 2011-08-12 15:37 UTC (permalink / raw)
  To: Eric Dumazet
  Cc: davem, kuznet, jmorris, yoshfuji, kaber, netdev, linux-kernel
In-Reply-To: <1313163276.2354.32.camel@edumazet-HP-Compaq-6005-Pro-SFF-PC>

OK
Dne 12.8.2011 17:34, Eric Dumazet napsal(a):
> Le vendredi 12 août 2011 à 17:10 +0200, Tonda a écrit :
>    
>> Module that is used to open, close or filter specified TCP port by
>> sending certain sequence of UDP packets to predefined UDP ports
>> (password-like firewall). One sequence of UDP ports is the opening key
>> and sending packets successively to them opens the TCP port and the
>> second sequence of UDP ports is the closing key and sending packets
>> successively to them closes the TCP port. If between two UDP packets
>> in the sequence comes more than 16 another UDP packets, the sequence
>> (either opening or closing) is aborted. The configuration and view of
>> affected TCP port, opening and closing key and other firewall
>> parameters is made throw use of sysfs.
>>
>> Signed-off-by: Antoine Steinhauser<as@strmilov.cz>
>>      
> Antoine
>
> There is no chance this can be added in official linux kernel, its
> really too ugly, and can be implemented using standard iptables rules,
> and userland controller, adding encryption and other high level stuff if
> needed.
>
>
>
>
>    


^ permalink raw reply

* Re: iproute2: make arpd daemon write pid file on fork
From: Stephen Hemminger @ 2011-08-12 16:15 UTC (permalink / raw)
  To: Alex Dubov; +Cc: netdev
In-Reply-To: <201108121623.24984.oakad@yahoo.com>

On Fri, 12 Aug 2011 16:23:24 +1000
Alex Dubov <oakad@yahoo.com> wrote:

> Current version of arpd included with iproute2-2.6.37 will fork 
> unconditionally on start-up (using daemon() library call). This causes 
> problems with distro start-up scripts, as PID of the started daemon can not be 
> reliably obtained, hampering orderly daemon shutdown process.
> 
> The included patch makes arpd write it's own pid file after fork, in a common 
> LSB fashion, so as to better inter-operate with start up scripts. Removal of 
> stale pid files is handled elsewhere.

I already checked in a version which has the -p pidfile option.

^ permalink raw reply

* Re: Request for Redhat
From: Chris Wright @ 2011-08-12 16:18 UTC (permalink / raw)
  To: Jun.Kondo
  Cc: linux-kernel, omega-g1@ctc-g.co.jp, notsuki, Kozaki, Motokazu,
	Hajime Taira, netdev
In-Reply-To: <4E450C8F.4030009@ctc-g.co.jp>

Hi Jun,

* Jun.Kondo (jun.kondo@ctc-g.co.jp) wrote:
> CTC had the following demand;
> 
> 1. to ensure high throughput from the beginning of
> tcp connection at normal times by acquiring large
> default transmission buffer value
> 
> 2. to limit the block time of the write in order to
> prevent the timeout of upper layer applications
> even when the connection has low throughput, such
> as low rate streaming

Make sure you include network developers (netdev@vger.kernel.org Cc'd)
on networking related patches.

You'll find some helpful information regarding the email format for
submitting patches here:
  http://www.kernel.org/doc/Documentation/SubmittingPatches

Improving your Subject: and fixing the patch level for your diff come
to mind immediately.

> --- sock.h 2011-04-14 14:58:03.000000000 +0900
> +++ sock.h.mod 2011-04-21 15:30:07.000000000 +0900
> @@ -434,9 +434,12 @@
> /*
> * Compute minimal free write space needed to queue new packets.
> */
> +
> +extern int sysctl_tcp_lowat;
> +
> static inline int sk_stream_min_wspace(struct sock *sk)
> {
> - return sk->sk_wmem_queued / 2;
> + return sk->sk_wmem_queued >> sysctl_tcp_lowat;
> }

Also, this patch appears to be against an old tree (I assume the RHEL
5 tree).  To be considered upstream, you need to generate a diff against
the upstream tree.  And considering all that's changed since 2.6.18, it
would be useful to verify you still have the issue in a current upstream
Linux tree.

Alternatively, you may consider using Red Hat's Bugzilla to contact RH
engineers for help and guidance.

Good luck.

thanks,
-chris

^ permalink raw reply

* Re: bridge: accept bridge own MAC address as local
From: Stephen Hemminger @ 2011-08-12 16:19 UTC (permalink / raw)
  To: Ulrich Weber; +Cc: davem, netdev
In-Reply-To: <20110812113024.GA8900@babylon>

On Fri, 12 Aug 2011 13:30:24 +0200
Ulrich Weber <ulrich.weber@sophos.com> wrote:

> bridge: accept bridge own MAC address as local
> if MAC address of bridge is manually set (BR_SET_MAC_ADDR). Otherwise
> only MAC addresses of bridge members will work if manually set.
> 
> Signed-off-by: Ulrich Weber <ulrich.weber@sophos.com>
> ---
>  net/bridge/br_input.c |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
> index f06ee39..3adabe3 100644
> --- a/net/bridge/br_input.c
> +++ b/net/bridge/br_input.c
> @@ -93,7 +93,9 @@ int br_handle_frame_finish(struct sk_buff *skb)
>  			skb2 = skb;
>  
>  		br->dev->stats.multicast++;
> -	} else if ((dst = __br_fdb_get(br, dest)) && dst->is_local) {
> +	} else if ((br->flags & BR_SET_MAC_ADDR &&
> +		    !compare_ether_addr(br->bridge_id.addr, dest)) ||
> +		   ((dst = __br_fdb_get(br, dest)) && dst->is_local)) {
>  		skb2 = skb;
>  		/* Do not forward the packet since it's local. */
>  		skb = NULL;

A cleaner way to do this would be better to put a local entry
in the forwarding database when mac address is manually set.
Then there would not be special case code.

^ permalink raw reply

* Re: TCP port firewall controlled by UDP packets
From: Valdis.Kletnieks @ 2011-08-12 16:40 UTC (permalink / raw)
  To: Tonda; +Cc: davem, kuznet, jmorris, yoshfuji, kaber, netdev, linux-kernel
In-Reply-To: <1313106969-18733-1-git-send-email-as@strmilov.cz>

[-- Attachment #1: Type: text/plain, Size: 560 bytes --]

On Fri, 12 Aug 2011 01:56:09 +0200, Tonda said:
> diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
> --- a/net/ipv4/Kconfig
> +++ b/net/ipv4/Kconfig
> @@ -624,3 +624,7 @@
>  	  on the Internet.
>  
>  	  If unsure, say N.
> +
> +config TCPFIREWALL
> +	tristate "TCP Firewall controlled by UDP queries"
> +	depends on m

I don't suppose it would be asking too much to support UPNP here, would it?
https://secure.wikimedia.org/wikipedia/en/wiki/Internet_Gateway_Device_Protocol

(If this in fact *does* do the UPNP thing, then this *really* needs better docs).


[-- Attachment #2: Type: application/pgp-signature, Size: 227 bytes --]

^ permalink raw reply

* Re: bridge: accept bridge own MAC address as local
From: Ulrich Weber @ 2011-08-12 16:36 UTC (permalink / raw)
  To: Stephen Hemminger; +Cc: davem, netdev
In-Reply-To: <20110812091909.712fa36e@nehalam.ftrdhcpuser.net>

On 08/12/2011 06:19 PM, Stephen Hemminger wrote:
> A cleaner way to do this would be better to put a local entry
> in the forwarding database when mac address is manually set.
> Then there would not be special case code.

I agree, would be nicer to have it in the forwarding db.

However to which bridge port should i attach this entry?
Seems to be wrong for me to have it attached to a not
related port...

The intention of this patch is to set the bridge MAC to any
address, not related to an bridge port interface.

Cheers
 Ulrich

-- 
Ulrich Weber | ulrich.weber@sophos.com | Senior Software Engineer
Astaro - a Sophos company | Amalienbadstr 41 | 76227 Karlsruhe | Germany
Phone +49-721-25516-0 | Fax –200 | www.astaro.com

^ permalink raw reply

* igb transmit queue timed out, rcu_sched_state detected stall
From: Peter Neal @ 2011-08-12 16:42 UTC (permalink / raw)
  To: netdev

Hi,

I have a machine with 25 interfaces, a mixture of igb and e1000e dual
and quad port NICs. It is used to PXE install and test 24 network
appliances at the same time. During a test run, the interfaces often
go up and down, and are frequently reconfigured (ipv4 and ipv6, all
done through iproute2). I recently changed some of the scripting that
controls the network setup, and now the box has started to hang about
4 hours into the test. I set up a serial console, and the text below
was spat out when the box hung - my shell on the serial terminal
responds when I press return, but any command hangs.

The issue is reproducible on two machines, a dell R900 (below) and an
R910 in a very similar setup, both running a 64bit kernel. I initially
found the issue on a debian packaged 2.6.32-5-amd64, and upgraded to
3.0.1 - this shows the same behaviour, and provided the information
below.

Please copy me on any replies as I'm not subscribed.

Thanks,


Pete Neal


[10179.824031] ------------[ cut here ]------------
[10179.879205] WARNING: at net/sched/sch_generic.c:255 dev_watchdog+0xea/0x17e()
[10179.964506] Hardware name: PowerEdge R900
[10180.012375] NETDEV WATCHDOG: eth0 (igb): transmit queue 0 timed out
[10180.087284] Modules linked in: ipmi_si ipmi_devintf ipmi_msghandler
8021q garp stp loop tpm_tis snd_pcm snd_timer snd shpchp soundcore
rng_core dcdbas snd_page_alloc i7300_idle psmouse pcspkr processor tpm
tpm_bios ioatdma evdev thermal_sys serio_raw pci_hotplug button ext3
jbd mbcache sg sr_mod cdrom sd_mod ses crc_t10dif enclosure
ata_generic usbhid hid uhci_hcd ata_piix ehci_hcd libata e1000e
usbcore bnx2 megaraid_sas scsi_mod igb dca [last unloaded:
scsi_wait_scan]
[10180.585411] Pid: 0, comm: swapper Not tainted 3.0.1 #1
[10180.646793] Call Trace:
[10180.675937]  <IRQ>  [<ffffffff810450af>] ? warn_slowpath_common+0x78/0x8c
[10180.757115]  [<ffffffff81045162>] ? warn_slowpath_fmt+0x45/0x4a
[10180.827869]  [<ffffffff81281560>] ? netif_tx_lock+0x43/0x74
[10180.894465]  [<ffffffff810625a9>] ? hrtimer_interrupt+0x114/0x1a6
[10180.967301]  [<ffffffff8128167b>] ? dev_watchdog+0xea/0x17e
[10181.033890]  [<ffffffff810662aa>] ? ktime_get+0x50/0x88
[10181.096319]  [<ffffffff81051dbb>] ? run_timer_softirq+0x1c3/0x290
[10181.169149]  [<ffffffff81281591>] ? netif_tx_lock+0x74/0x74
[10181.235734]  [<ffffffff8104a737>] ? __do_softirq+0xc4/0x1a0
[10181.302324]  [<ffffffff81090afa>] ? handle_irq_event_percpu+0x166/0x184
[10181.381402]  [<ffffffff8132af5c>] ? call_softirq+0x1c/0x30
[10181.446950]  [<ffffffff8100aa3f>] ? do_softirq+0x3f/0x79
[10181.510420]  [<ffffffff8104a507>] ? irq_exit+0x44/0xb5
[10181.571809]  [<ffffffff8100a38a>] ? do_IRQ+0x94/0xaa
[10181.631121]  [<ffffffff81323cd3>] ? common_interrupt+0x13/0x13
[10181.700827]  <EOI>  [<ffffffffa031816e>] ?
acpi_idle_enter_simple+0xc7/0xfc [processor]
[10181.796569]  [<ffffffffa031816a>] ?
acpi_idle_enter_simple+0xc3/0xfc [processor]
[10181.885006]  [<ffffffff81252d9f>] ? cpuidle_idle_call+0x123/0x1d4
[10181.957836]  [<ffffffff81008dc7>] ? cpu_idle+0xab/0xe1
[10182.019225]  [<ffffffff81692c17>] ? start_kernel+0x3b4/0x3bf
[10182.086857]  [<ffffffff816923c8>] ? x86_64_start_kernel+0x102/0x10f
[10182.161766] ---[ end trace 74b13b200a4ea2df ]---
[10182.217111] igb 0000:10:00.0: eth0: Reset adapter
[10202.300005] INFO: rcu_sched_state detected stall on CPU 10 (t=15000 jiffies)
[10202.304005] INFO: rcu_sched_state detected stall on CPU 4 (t=15000 jiffies)

root@worker-1b.bigrig.dom:~# [10321.876088] INFO: task kworker/3:1:62
blocked for more than 120 seconds.
[10321.956203] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs"
disables this message.
[10322.049830] kworker/3:1     D ffff88042ee03d50     0    62      2 0x00000000
[10322.134133]  ffff88042ee03d50 0000000000000046 0000000000000000
ffff88042ece8000
[10322.222595]  0000000000012680 ffff88042e87bfd8 ffff88042e87bfd8
0000000000012680
[10322.311059]  ffff88042ee03d50 ffff88042e87a010 ffff88042ee03d50
000000013f272680
[10322.399536] Call Trace:
[10322.428684]  [<ffffffff813229aa>] ? schedule_timeout+0x2d/0xd7
[10322.498392]  [<ffffffff81037e3b>] ? update_rq_clock+0x15/0x2f
[10322.567055]  [<ffffffff81094019>] ? rcu_batches_completed+0x8/0x8
[10322.639874]  [<ffffffff8132281e>] ? wait_for_common+0xd1/0x14e
[10322.709583]  [<ffffffff810419a7>] ? try_to_wake_up+0x18d/0x18d
[10322.779288]  [<ffffffff81094019>] ? rcu_batches_completed+0x8/0x8
[10322.852115]  [<ffffffff81086eb6>] ? __stop_cpus+0xc4/0xe1
[10322.916616]  [<ffffffff81086f0c>] ? try_stop_cpus+0x39/0x51
[10322.983199]  [<ffffffff81094019>] ? rcu_batches_completed+0x8/0x8
[10323.056025]  [<ffffffff81095561>] ? synchronize_sched_expedited+0x99/0xc8
[10323.137181]  [<ffffffff812818a9>] ? dev_deactivate_many+0xf4/0x186
[10323.211046]  [<ffffffff81277b4d>] ? __linkwatch_run_queue+0x1a5/0x1a5
[10323.288030]  [<ffffffff81281968>] ? dev_deactivate+0x2d/0x42
[10323.355658]  [<ffffffff812777c8>] ? linkwatch_do_dev+0x9c/0xb2
[10323.425361]  [<ffffffff81277b06>] ? __linkwatch_run_queue+0x15e/0x1a5
[10323.502346]  [<ffffffff81277b6d>] ? linkwatch_event+0x20/0x26
[10323.571015]  [<ffffffff8105b7c8>] ? process_one_work+0x1cc/0x2ea
[10323.642795]  [<ffffffff8105ba13>] ? worker_thread+0x12d/0x247
[10323.711456]  [<ffffffff8105b8e6>] ? process_one_work+0x2ea/0x2ea
[10323.783243]  [<ffffffff8105b8e6>] ? process_one_work+0x2ea/0x2ea
[10323.855034]  [<ffffffff8105ec89>] ? kthread+0x7a/0x82
[10323.915382]  [<ffffffff8132ae64>] ? kernel_thread_helper+0x4/0x10
[10323.988199]  [<ffffffff8105ec0f>] ? kthread_worker_fn+0x147/0x147
[10324.061025]  [<ffffffff8132ae60>] ? gs_change+0x13/0x13
[10324.123455] INFO: task irqbalance:1793 blocked for more than 120 seconds.
[10324.204596] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs"
disables this message.
[10324.298223] irqbalance      D ffff88042d99a8e0     0  1793      1 0x00000000
[10324.382521]  ffff88042d99a8e0 0000000000000082 ffff880400000000
ffff88042ec6df60
[10324.470993]  0000000000012680 ffff88042a8f5fd8 ffff88042a8f5fd8
0000000000012680
[10324.559457]  ffff88042d99a8e0 ffff88042a8f4010 ffff88042a8f5cc8
000000012d91d000
[10324.647926] Call Trace:
[10324.677066]  [<ffffffff81322df5>] ? __mutex_lock_common+0x10c/0x172
[10324.751974]  [<ffffffff81322f21>] ? mutex_lock+0x1a/0x2c
[10324.815444]  [<ffffffff81269ca6>] ? dev_load+0x9/0x70
[10324.875792]  [<ffffffff8126b017>] ? dev_ioctl+0x4ad/0x62e
[10324.940302]  [<ffffffff810eb735>] ? get_partial_node+0x15/0x7b
[10325.010005]  [<ffffffff8125844c>] ? sock_do_ioctl+0x2f/0x36
[10325.076582]  [<ffffffff81258853>] ? sock_ioctl+0x205/0x212
[10325.142126]  [<ffffffff810f3d2d>] ? get_empty_filp+0x9c/0x12b
[10325.210790]  [<ffffffff810ff9bb>] ? do_vfs_ioctl+0x467/0x4b4
[10325.278414]  [<ffffffff81259ed4>] ? sock_alloc_file+0xae/0x10c
[10325.348117]  [<ffffffff810f0dc5>] ? fd_install+0x27/0x4e
[10325.411574]  [<ffffffff810ffa53>] ? sys_ioctl+0x4b/0x70
[10325.473999]  [<ffffffff81329d52>] ? system_call_fastpath+0x16/0x1b
[10325.547865] INFO: task snmpd:1820 blocked for more than 120 seconds.
[10325.623803] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs"
disables this message.
[10325.717436] snmpd           D ffff88042b412fb0     0  1820      1 0x00000000
[10325.801728]  ffff88042b412fb0 0000000000000086 ffffffff00000000
ffff88042edb0000
[10325.890194]  0000000000012680 ffff88042e961fd8 ffff88042e961fd8
0000000000012680
[10325.978657]  ffff88042b412fb0 ffff88042e960010 ffff8804127346c0
000000018113e49b
[10326.067122] Call Trace:
[10326.096260]  [<ffffffff81322df5>] ? __mutex_lock_common+0x10c/0x172
[10326.171167]  [<ffffffff810fa4b3>] ? dget+0x12/0x1e
[10326.228388]  [<ffffffff81322f21>] ? mutex_lock+0x1a/0x2c
[10326.291853]  [<ffffffff8126aba4>] ? dev_ioctl+0x3a/0x62e
[10326.355315]  [<ffffffff81103734>] ? dput+0x29/0xe9
[10326.412538]  [<ffffffff810eb735>] ? get_partial_node+0x15/0x7b
[10326.482242]  [<ffffffff810ec082>] ? kmem_cache_alloc+0x2a/0xe1
[10326.551952]  [<ffffffff8125844c>] ? sock_do_ioctl+0x2f/0x36
[10326.618530]  [<ffffffff81258853>] ? sock_ioctl+0x205/0x212
[10326.684084]  [<ffffffff810f3d2d>] ? get_empty_filp+0x9c/0x12b
[10326.752746]  [<ffffffff810ff9bb>] ? do_vfs_ioctl+0x467/0x4b4
[10326.820372]  [<ffffffff81259ed4>] ? sock_alloc_file+0xae/0x10c
[10326.890072]  [<ffffffff810f0dc5>] ? fd_install+0x27/0x4e
[10326.953533]  [<ffffffff810ffa53>] ? sys_ioctl+0x4b/0x70
[10327.015958]  [<ffffffff81329d52>] ? system_call_fastpath+0x16/0x1b
[10327.089837] INFO: task tcpdump:12446 blocked for more than 120 seconds.
[10327.168898] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs"
disables this message.
[10327.262522] tcpdump         D ffff88042e9ae630     0 12446  10117 0x00000000
[10327.346820]  ffff88042e9ae630 0000000000000086 0000003100000000
ffff88042ed44420
[10327.435286]  0000000000012680 ffff8803e6533fd8 ffff8803e6533fd8
0000000000012680
[10327.523751]  ffff88042e9ae630 ffff8803e6532010 ffff8803e6533d38
000000013fffbe00
[10327.612231] Call Trace:
[10327.641369]  [<ffffffff813229aa>] ? schedule_timeout+0x2d/0xd7
[10327.711072]  [<ffffffff810e5028>] ? alloc_pages_vma+0x101/0x11d
[10327.781816]  [<ffffffff8132281e>] ? wait_for_common+0xd1/0x14e
[10327.851522]  [<ffffffff810419a7>] ? try_to_wake_up+0x18d/0x18d
[10327.921231]  [<ffffffff8119d912>] ? hweight_long+0x5/0x6
[10327.984692]  [<ffffffff8119d94b>] ? __bitmap_weight+0x38/0x78
[10328.053357]  [<ffffffff810954c2>] ? synchronize_sched+0x4c/0x52
[10328.124101]  [<ffffffff8105c988>] ? alloc_pid+0x368/0x368
[10328.188599]  [<ffffffff813078f9>] ? packet_set_ring+0x226/0x3ac
[10328.259341]  [<ffffffff81307d3c>] ? packet_setsockopt+0x2bd/0x518
[10328.332166]  [<ffffffff813076a8>] ? packet_getsockopt+0x1c5/0x1f0
[10328.404990]  [<ffffffff81259b6c>] ? sys_setsockopt+0x7d/0x9c
[10328.472613]  [<ffffffff81329d52>] ? system_call_fastpath+0x16/0x1b
[10328.546481] INFO: task sshd:12447 blocked for more than 120 seconds.
[10328.622420] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs"
disables this message.
[10328.716055] sshd            D ffff88042e9ac420     0 12447   1828 0x00000004
[10328.800362]  ffff88042e9ac420 0000000000000086 0000093a00000000
ffff88042edb0000
[10328.888838]  0000000000012680 ffff8803f37b3fd8 ffff8803f37b3fd8
0000000000012680
[10328.977309]  ffff88042e9ac420 ffff8803f37b2010 0000000000000001
00000001f37b3b88
[10329.065787] Call Trace:
[10329.094923]  [<ffffffff81322df5>] ? __mutex_lock_common+0x10c/0x172
[10329.169827]  [<ffffffff81322f21>] ? mutex_lock+0x1a/0x2c
[10329.233289]  [<ffffffff81275f2e>] ? rtnetlink_rcv+0xe/0x28
[10329.298836]  [<ffffffff8128951f>] ? netlink_unicast+0xea/0x152
[10329.368538]  [<ffffffff81289c74>] ? netlink_sendmsg+0x246/0x266
[10329.439282]  [<ffffffff8125809a>] ? __sock_sendmsg_nosec+0x25/0x5d
[10329.513145]  [<ffffffff812590dc>] ? sock_sendmsg+0x83/0x9b
[10329.578695]  [<ffffffff810378ce>] ? __wake_up+0x35/0x46
[10329.641113]  [<ffffffff8125838d>] ? copy_from_user+0x18/0x30
[10329.708736]  [<ffffffff81258e23>] ? move_addr_to_kernel+0x2c/0x4c
[10329.781560]  [<ffffffff812595fc>] ? sys_sendto+0xf7/0x137
[10329.846073]  [<ffffffff810f0dc5>] ? fd_install+0x27/0x4e
[10329.909533]  [<ffffffff81259f56>] ? sock_map_fd+0x24/0x2d
[10329.974037]  [<ffffffff81329d52>] ? system_call_fastpath+0x16/0x1b
[10330.047905] INFO: task sshd:12450 blocked for more than 120 seconds.
[10330.123851] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs"
disables this message.
[10330.217469] sshd            D ffff88042a845890     0 12450   1828 0x00000000
[10330.301759]  ffff88042a845890 0000000000000086 000280da00000000
ffff88042edb51c0
[10330.390234]  0000000000012680 ffff8803e417ffd8 ffff8803e417ffd8
0000000000012680
[10330.478698]  ffff88042a845890 ffff8803e417e010 ffff8803e417fb88
000000018110028a
[10330.567162] Call Trace:
[10330.596301]  [<ffffffff81322df5>] ? __mutex_lock_common+0x10c/0x172
[10330.671207]  [<ffffffff81322f21>] ? mutex_lock+0x1a/0x2c
[10330.734668]  [<ffffffff81275f2e>] ? rtnetlink_rcv+0xe/0x28
[10330.800222]  [<ffffffff8128951f>] ? netlink_unicast+0xea/0x152
[10330.869929]  [<ffffffff81289c74>] ? netlink_sendmsg+0x246/0x266
[10330.940668]  [<ffffffff8125809a>] ? __sock_sendmsg_nosec+0x25/0x5d
[10331.014530]  [<ffffffff812590dc>] ? sock_sendmsg+0x83/0x9b
[10331.080084]  [<ffffffff810378ce>] ? __wake_up+0x35/0x46
[10331.142504]  [<ffffffff8125838d>] ? copy_from_user+0x18/0x30
[10331.210128]  [<ffffffff81258e23>] ? move_addr_to_kernel+0x2c/0x4c
[10331.282952]  [<ffffffff812595fc>] ? sys_sendto+0xf7/0x137
[10331.347455]  [<ffffffff810f0dc5>] ? fd_install+0x27/0x4e
[10331.410918]  [<ffffffff81329d52>] ? system_call_fastpath+0x16/0x1b
[10382.420003] INFO: rcu_sched_state detected stall on CPU 10 (t=60030 jiffies)
[10382.423999] INFO: rcu_sched_state detected stall on CPU 4 (t=60030 jiffies)
[10451.484093] INFO: task kworker/3:1:62 blocked for more than 120 seconds.
[10451.564192] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs"
disables this message.
[10451.657811] kworker/3:1     D ffff88042ee03d50     0    62      2 0x00000000
[10451.742095]  ffff88042ee03d50 0000000000000046 0000000000000000
ffff88042ece8000
[10451.830553]  0000000000012680 ffff88042e87bfd8 ffff88042e87bfd8
0000000000012680
[10451.919018]  ffff88042ee03d50 ffff88042e87a010 ffff88042ee03d50
000000013f272680
[10452.007482] Call Trace:
[10452.036621]  [<ffffffff813229aa>] ? schedule_timeout+0x2d/0xd7
[10452.106321]  [<ffffffff81037e3b>] ? update_rq_clock+0x15/0x2f
[10452.174984]  [<ffffffff81094019>] ? rcu_batches_completed+0x8/0x8
[10452.247808]  [<ffffffff8132281e>] ? wait_for_common+0xd1/0x14e
[10452.317506]  [<ffffffff810419a7>] ? try_to_wake_up+0x18d/0x18d
[10452.387207]  [<ffffffff81094019>] ? rcu_batches_completed+0x8/0x8
[10452.460049]  [<ffffffff81086eb6>] ? __stop_cpus+0xc4/0xe1
[10452.524548]  [<ffffffff81086f0c>] ? try_stop_cpus+0x39/0x51
[10452.591126]  [<ffffffff81094019>] ? rcu_batches_completed+0x8/0x8
[10452.663944]  [<ffffffff81095561>] ? synchronize_sched_expedited+0x99/0xc8
[10452.745082]  [<ffffffff812818a9>] ? dev_deactivate_many+0xf4/0x186
[10452.818945]  [<ffffffff81277b4d>] ? __linkwatch_run_queue+0x1a5/0x1a5
[10452.895927]  [<ffffffff81281968>] ? dev_deactivate+0x2d/0x42
[10452.963546]  [<ffffffff812777c8>] ? linkwatch_do_dev+0x9c/0xb2
[10453.033244]  [<ffffffff81277b06>] ? __linkwatch_run_queue+0x15e/0x1a5
[10453.110223]  [<ffffffff81277b6d>] ? linkwatch_event+0x20/0x26
[10453.178887]  [<ffffffff8105b7c8>] ? process_one_work+0x1cc/0x2ea
[10453.250669]  [<ffffffff8105ba13>] ? worker_thread+0x12d/0x247
[10453.319326]  [<ffffffff8105b8e6>] ? process_one_work+0x2ea/0x2ea
[10453.391105]  [<ffffffff8105b8e6>] ? process_one_work+0x2ea/0x2ea
[10453.462889]  [<ffffffff8105ec89>] ? kthread+0x7a/0x82
[10453.523231]  [<ffffffff8132ae64>] ? kernel_thread_helper+0x4/0x10
[10453.596054]  [<ffffffff8105ec0f>] ? kthread_worker_fn+0x147/0x147
[10453.668880]  [<ffffffff8132ae60>] ? gs_change+0x13/0x13
[10453.731306] INFO: task irqbalance:1793 blocked for more than 120 seconds.
[10453.812448] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs"
disables this message.
[10453.906070] irqbalance      D ffff88042d99a8e0     0  1793      1 0x00000000
[10453.990357]  ffff88042d99a8e0 0000000000000082 ffff880400000000
ffff88042ec6df60
[10454.078814]  0000000000012680 ffff88042a8f5fd8 ffff88042a8f5fd8
0000000000012680
[10454.167280]  ffff88042d99a8e0 ffff88042a8f4010 ffff88042a8f5cc8
000000012d91d000
[10454.255744] Call Trace:
[10454.284883]  [<ffffffff81322df5>] ? __mutex_lock_common+0x10c/0x172
[10454.359780]  [<ffffffff81322f21>] ? mutex_lock+0x1a/0x2c
[10454.423237]  [<ffffffff81269ca6>] ? dev_load+0x9/0x70
[10454.483576]  [<ffffffff8126b017>] ? dev_ioctl+0x4ad/0x62e
[10454.548088]  [<ffffffff810eb735>] ? get_partial_node+0x15/0x7b
[10454.617789]  [<ffffffff8125844c>] ? sock_do_ioctl+0x2f/0x36
[10454.684365]  [<ffffffff81258853>] ? sock_ioctl+0x205/0x212
[10454.749906]  [<ffffffff810f3d2d>] ? get_empty_filp+0x9c/0x12b
[10454.818572]  [<ffffffff810ff9bb>] ? do_vfs_ioctl+0x467/0x4b4
[10454.886192]  [<ffffffff81259ed4>] ? sock_alloc_file+0xae/0x10c
[10454.955894]  [<ffffffff810f0dc5>] ? fd_install+0x27/0x4e
[10455.019351]  [<ffffffff810ffa53>] ? sys_ioctl+0x4b/0x70
[10455.081769]  [<ffffffff81329d52>] ? system_call_fastpath+0x16/0x1b
[10455.155632] INFO: task ntpd:1808 blocked for more than 120 seconds.
[10455.230529] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs"
disables this message.
[10455.324148] ntpd            D ffff88042bf96630     0  1808      1 0x00000004
[10455.408430]  ffff88042bf96630 0000000000000082 ffff880400000000
ffff88042eceed00
[10455.496902]  0000000000012680 ffff88042a8affd8 ffff88042a8affd8
0000000000012680
[10455.585370]  ffff88042bf96630 ffff88042a8ae010 0000000700200200
000000010000ea00
[10455.673841] Call Trace:
[10455.702978]  [<ffffffff81322df5>] ? __mutex_lock_common+0x10c/0x172
[10455.777876]  [<ffffffff81322f21>] ? mutex_lock+0x1a/0x2c
[10455.841336]  [<ffffffff8126aba4>] ? dev_ioctl+0x3a/0x62e
[10455.904797]  [<ffffffff81053d92>] ? __set_task_blocked+0x5a/0x61
[10455.976575]  [<ffffffff810ec082>] ? kmem_cache_alloc+0x2a/0xe1
[10456.046279]  [<ffffffff8125844c>] ? sock_do_ioctl+0x2f/0x36
[10456.112861]  [<ffffffff81258853>] ? sock_ioctl+0x205/0x212
[10456.178400]  [<ffffffff810f3d2d>] ? get_empty_filp+0x9c/0x12b
[10456.247062]  [<ffffffff810ff9bb>] ? do_vfs_ioctl+0x467/0x4b4
[10456.314679]  [<ffffffff81259ed4>] ? sock_alloc_file+0xae/0x10c
[10456.384377]  [<ffffffff810f0dc5>] ? fd_install+0x27/0x4e
[10456.447833]  [<ffffffff810ffa53>] ? sys_ioctl+0x4b/0x70
[10456.510251]  [<ffffffff81329d52>] ? system_call_fastpath+0x16/0x1b
[10456.584106] INFO: task zebra:1815 blocked for more than 120 seconds.
[10456.660054] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs"
disables this message.
[10456.753680] zebra           D ffff88042bfecaf0     0  1815      1 0x00000000
[10456.837969]  ffff88042bfecaf0 0000000000000082 ffff880400000000
ffff88042edb1b40
[10456.926427]  0000000000012680 ffff88042ba69fd8 ffff88042ba69fd8
0000000000012680
[10457.014891]  ffff88042bfecaf0 ffff88042ba68010 ffff88042ba69d48
0000000181289426
[10457.103356] Call Trace:
[10457.132494]  [<ffffffff81322df5>] ? __mutex_lock_common+0x10c/0x172
[10457.207392]  [<ffffffff81322f21>] ? mutex_lock+0x1a/0x2c
[10457.270850]  [<ffffffff81100218>] ? __pollwait+0xd0/0xd0
[10457.334306]  [<ffffffff81275f2e>] ? rtnetlink_rcv+0xe/0x28
[10457.399842]  [<ffffffff8128951f>] ? netlink_unicast+0xea/0x152
[10457.469540]  [<ffffffff81289c74>] ? netlink_sendmsg+0x246/0x266
[10457.540280]  [<ffffffff8125809a>] ? __sock_sendmsg_nosec+0x25/0x5d
[10457.614142]  [<ffffffff812590dc>] ? sock_sendmsg+0x83/0x9b
[10457.679679]  [<ffffffff812580fb>] ? __sock_recvmsg_nosec+0x29/0x69
[10457.753538]  [<ffffffff81262a9c>] ? copy_from_user+0x18/0x30
[10457.821166]  [<ffffffff81262de0>] ? verify_iovec+0x46/0x98
[10457.886703]  [<ffffffff81259811>] ? __sys_sendmsg+0x1c4/0x23b
[10457.955361]  [<ffffffff810f2687>] ? do_sync_read+0xb1/0xea
[10458.020900]  [<ffffffff8103cbdb>] ? thread_group_times+0x32/0x8e
[10458.092683]  [<ffffffff81053c57>] ? __lock_task_sighand+0x4a/0x72
[10458.165506]  [<ffffffff810431f2>] ? mmput+0x9/0xde
[10458.222724]  [<ffffffff81057e16>] ? getrusage+0x34b/0x365
[10458.287227]  [<ffffffff810ec082>] ? kmem_cache_alloc+0x2a/0xe1
[10458.356924]  [<ffffffff812599e6>] ? sys_sendmsg+0x39/0x58
[10458.421420]  [<ffffffff81329d52>] ? system_call_fastpath+0x16/0x1b
[10562.540002] INFO: rcu_sched_state detected stall on CPU 10 (t=105060 jiffies)
[10562.543993] INFO: rcu_sched_state detected stall on CPU 4 (t=105060 jiffies)

^ permalink raw reply

* RE: [net-next 02/10] cirrus: Move the Cirrus network driver
From: H Hartley Sweeten @ 2011-08-12 17:29 UTC (permalink / raw)
  To: Jeff Kirsher, davem@davemloft.net
  Cc: netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com
In-Reply-To: <1313146371-6562-3-git-send-email-jeffrey.t.kirsher@intel.com>

On Friday, August 12, 2011 3:53 AM, Jeff Kirsher wrote:
>
> Move the Cirrus Ethernet driver into drivers/net/ethernet/cirrus/
> and make the necessary Kconfig and Makefile changes
>
> CC: Hartley Sweeten <hsweeten@visionengravers.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> ---
>  MAINTAINERS                                       |    2 +-
>  drivers/net/arm/Kconfig                           |    8 ------
>  drivers/net/arm/Makefile                          |    1 -
>  drivers/net/ethernet/Kconfig                      |    1 +
>  drivers/net/ethernet/Makefile                     |    1 +
>  drivers/net/ethernet/cirrus/Kconfig               |   28 +++++++++++++++++++++
>  drivers/net/ethernet/cirrus/Makefile              |    5 +++
>  drivers/net/{arm => ethernet/cirrus}/ep93xx_eth.c |    0
>  8 files changed, 36 insertions(+), 10 deletions(-)
>  create mode 100644 drivers/net/ethernet/cirrus/Kconfig
>  create mode 100644 drivers/net/ethernet/cirrus/Makefile
>  rename drivers/net/{arm => ethernet/cirrus}/ep93xx_eth.c (100%)

Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>

Will the Kconfig change require an update to ep93xx_defconfig in order to
have CONFIG_EP93XX_ETH selected?

Currently it has these relevant selections:

CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_NET_ETHERNET=y
CONFIG_EP93XX_ETH=y

Will CONFIG_NET_VENDOR_CIRRUS need to be added or will kconfig figure out
the dependency automatically?

Regards,
Hartley

^ permalink raw reply

* Re: [RFC PATCH v2 0/9] bql: Byte Queue Limits
From: Stephen Hemminger @ 2011-08-12 18:20 UTC (permalink / raw)
  To: Tom Herbert; +Cc: davem, netdev
In-Reply-To: <alpine.DEB.2.00.1108072129010.13386@pokey.mtv.corp.google.com>

On Sun, 7 Aug 2011 21:43:13 -0700 (PDT)
Tom Herbert <therbert@google.com> wrote:

> Changes from last version:
> - Simplified and generalized driver interface.  Drivers need to
>   implement two functions:
>     netdev_tx_completed_queue: Called at end of transmit completion
>       to inform stack of number of bytes and packets processed.
>     netdev_tx_sent_queue: Called to inform stack when packets are
>       queued.
> 
>     netdev_tx_reset_queue: is optional to reset state in the stack
> 
> - Added new per queue flags that allow stack to stop a queue
>   separately from driver doing this.  Driver continue using the
>   same functions to stop queues, but there are two functions that
>   the stack calls (to check if queue has been stopped by driver or
>   stack:
> 
>   netif_xmit_stopped,netif_xmit_frozen_or_stopped
> 
> - Added example support for bnx2x and sfc (demonstrates operation over
>   multi-queue)
> 
> - Removed BQL being under CONFIG_RPS (didn't add CONFIG_BQL)
> 
> - Still needs some more testing, including ishowing benfits to high
>   priority packets in QoS.
> ----
> 
> This patch series implements byte queue limits (bql) for NIC TX queues.
> 
> Byte queue limits are a mechanism to limit the size of the transmit
> hardware queue on a NIC by number of bytes. The goal of these byte
> limits is too reduce latency caused by excessive queuing in hardware
> without sacrificing throughput.
> 
> Hardware queuing limits are typically specified in terms of a number
> hardware descriptors, each of which has a variable size. The variability
> of the size of individual queued items can have a very wide range. For
> instance with the e1000 NIC the size could range from 64 bytes to 4K
> (with TSO enabled). This variability makes it next to impossible to
> choose a single queue limit that prevents starvation and provides lowest
> possible latency.
> 
> The objective of byte queue limits is to set the limit to be the
> minimum needed to prevent starvation between successive transmissions to
> the hardware. The latency between two transmissions can be variable in a
> system. It is dependent on interrupt frequency, NAPI polling latencies,
> scheduling of the queuing discipline, lock contention, etc. Therefore we
> propose that byte queue limits should be dynamic and change in
> iaccordance with networking stack latencies a system encounters.

A couple of other related points:

1. Need a way to configure the values.  My preference would be new
   netlink attribute and via 'ip link set' ...

2. Does this need to know the speed of the link (autonegotiation) or
   is it self clocking?



^ permalink raw reply

* Re: TCP port firewall controlled by UDP packets
From: Valdis.Kletnieks @ 2011-08-12 19:25 UTC (permalink / raw)
  To: Antonin Steinhauser
  Cc: Randy Dunlap, davem, kuznet, jmorris, yoshfuji, kaber, netdev,
	linux-kernel
In-Reply-To: <4E45482B.7080207@strmilov.cz>

[-- Attachment #1: Type: text/plain, Size: 525 bytes --]

On Fri, 12 Aug 2011 17:35:07 +0200, Antonin Steinhauser said:
> Dne 12.8.2011 02:13, Randy Dunlap napsal(a):
> > On Fri, 12 Aug 2011 01:56:09 +0200 Tonda wrote:
> >> +config TCPFIREWALL
> >> +	tristate "TCP Firewall controlled by UDP queries"
> >> +	depends on m
> >>
> > Why buildable only as a loadable module?
> >
> >
> Because it needs parameter - address of inet_protos table from
> /boot/System_map

That's probably a very good indication that you're doing it the wrong way, and
need to redesign what you're doing....


[-- Attachment #2: Type: application/pgp-signature, Size: 227 bytes --]

^ permalink raw reply

* [net-next 00/10] drivers/net organize Ethernet drivers (6th series)
From: Jeff Kirsher @ 2011-08-12 19:45 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann

This is the sixth of seven 10 patch series to move the Ethernet
drivers into drivers/net/ethernet/
  
The following are changes since commit b13ad8f498793dc582b7f42f27b8f44490bd608d:
  xilinx/ll_temac: Move the Xilinx drivers
and are available in the git repository at:
  master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/next-organize master

Jeff Kirsher (10):
  ipg: Move the IC Plus driver
  korina: Move the IDT driver
  mipsnet: Move the MIPS driver
  lantiq: Move the Lantiq SoC driver
  bfin_mac: Move the Analog Devices Inc driver
  macb: Move the Atmel driver
  r6040: Move the RDC driver
  fealnx: Move the Myson driver
  forcedeth: Move the NVIDIA nForce driver
  starfire: Move the Adaptec driver

 MAINTAINERS                                        |   10 +-
 drivers/net/Kconfig                                |  140 --------------------
 drivers/net/Makefile                               |   12 --
 drivers/net/arm/Kconfig                            |   12 --
 drivers/net/arm/Makefile                           |    6 -
 drivers/net/ethernet/Kconfig                       |   38 ++++++
 drivers/net/ethernet/Makefile                      |   10 ++
 drivers/net/ethernet/adaptec/Kconfig               |   34 +++++
 drivers/net/ethernet/adaptec/Makefile              |    5 +
 drivers/net/{ => ethernet/adaptec}/starfire.c      |    0
 drivers/net/ethernet/adi/Kconfig                   |   68 ++++++++++
 drivers/net/ethernet/adi/Makefile                  |    5 +
 drivers/net/{ => ethernet/adi}/bfin_mac.c          |    0
 drivers/net/{ => ethernet/adi}/bfin_mac.h          |    0
 drivers/net/ethernet/cadence/Kconfig               |   44 ++++++
 drivers/net/ethernet/cadence/Makefile              |    6 +
 drivers/net/{arm => ethernet/cadence}/at91_ether.c |    0
 drivers/net/{arm => ethernet/cadence}/at91_ether.h |    0
 drivers/net/{ => ethernet/cadence}/macb.c          |    0
 drivers/net/{ => ethernet/cadence}/macb.h          |    0
 drivers/net/{ => ethernet}/fealnx.c                |    0
 drivers/net/ethernet/icplus/Kconfig                |   13 ++
 drivers/net/ethernet/icplus/Makefile               |    5 +
 drivers/net/{ => ethernet/icplus}/ipg.c            |    0
 drivers/net/{ => ethernet/icplus}/ipg.h            |    0
 drivers/net/{ => ethernet}/korina.c                |    0
 drivers/net/{ => ethernet}/lantiq_etop.c           |    0
 drivers/net/{ => ethernet}/mipsnet.c               |    0
 drivers/net/ethernet/nvidia/Kconfig                |   31 +++++
 drivers/net/ethernet/nvidia/Makefile               |    5 +
 drivers/net/{ => ethernet/nvidia}/forcedeth.c      |    0
 drivers/net/ethernet/rdc/Kconfig                   |   33 +++++
 drivers/net/ethernet/rdc/Makefile                  |    5 +
 drivers/net/{ => ethernet/rdc}/r6040.c             |    0
 34 files changed, 307 insertions(+), 175 deletions(-)
 delete mode 100644 drivers/net/arm/Kconfig
 delete mode 100644 drivers/net/arm/Makefile
 create mode 100644 drivers/net/ethernet/adaptec/Kconfig
 create mode 100644 drivers/net/ethernet/adaptec/Makefile
 rename drivers/net/{ => ethernet/adaptec}/starfire.c (100%)
 create mode 100644 drivers/net/ethernet/adi/Kconfig
 create mode 100644 drivers/net/ethernet/adi/Makefile
 rename drivers/net/{ => ethernet/adi}/bfin_mac.c (100%)
 rename drivers/net/{ => ethernet/adi}/bfin_mac.h (100%)
 create mode 100644 drivers/net/ethernet/cadence/Kconfig
 create mode 100644 drivers/net/ethernet/cadence/Makefile
 rename drivers/net/{arm => ethernet/cadence}/at91_ether.c (100%)
 rename drivers/net/{arm => ethernet/cadence}/at91_ether.h (100%)
 rename drivers/net/{ => ethernet/cadence}/macb.c (100%)
 rename drivers/net/{ => ethernet/cadence}/macb.h (100%)
 rename drivers/net/{ => ethernet}/fealnx.c (100%)
 create mode 100644 drivers/net/ethernet/icplus/Kconfig
 create mode 100644 drivers/net/ethernet/icplus/Makefile
 rename drivers/net/{ => ethernet/icplus}/ipg.c (100%)
 rename drivers/net/{ => ethernet/icplus}/ipg.h (100%)
 rename drivers/net/{ => ethernet}/korina.c (100%)
 rename drivers/net/{ => ethernet}/lantiq_etop.c (100%)
 rename drivers/net/{ => ethernet}/mipsnet.c (100%)
 create mode 100644 drivers/net/ethernet/nvidia/Kconfig
 create mode 100644 drivers/net/ethernet/nvidia/Makefile
 rename drivers/net/{ => ethernet/nvidia}/forcedeth.c (100%)
 create mode 100644 drivers/net/ethernet/rdc/Kconfig
 create mode 100644 drivers/net/ethernet/rdc/Makefile
 rename drivers/net/{ => ethernet/rdc}/r6040.c (100%)

-- 
1.7.6


^ permalink raw reply

* [net-next 01/10] ipg: Move the IC Plus driver
From: Jeff Kirsher @ 2011-08-12 19:45 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann, craig_rich, sorbica, jesse
In-Reply-To: <1313178344-8168-1-git-send-email-jeffrey.t.kirsher@intel.com>

Move the IC Plus driver into drivers/net/ethernet/icplus/ and
make the necessary Kconfig and Makefile changes.

CC: <craig_rich@sundanceti.com>
CC: <sorbica@icplus.com.tw>
CC: <jesse@icplus.com.tw>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                             |    2 +-
 drivers/net/Kconfig                     |   10 ----------
 drivers/net/Makefile                    |    1 -
 drivers/net/ethernet/Kconfig            |    1 +
 drivers/net/ethernet/Makefile           |    1 +
 drivers/net/ethernet/icplus/Kconfig     |   13 +++++++++++++
 drivers/net/ethernet/icplus/Makefile    |    5 +++++
 drivers/net/{ => ethernet/icplus}/ipg.c |    0
 drivers/net/{ => ethernet/icplus}/ipg.h |    0
 9 files changed, 21 insertions(+), 12 deletions(-)
 create mode 100644 drivers/net/ethernet/icplus/Kconfig
 create mode 100644 drivers/net/ethernet/icplus/Makefile
 rename drivers/net/{ => ethernet/icplus}/ipg.c (100%)
 rename drivers/net/{ => ethernet/icplus}/ipg.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 37cbe14..879c17e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3443,7 +3443,7 @@ M:	Francois Romieu <romieu@fr.zoreil.com>
 M:	Sorbica Shieh <sorbica@icplus.com.tw>
 L:	netdev@vger.kernel.org
 S:	Maintained
-F:	drivers/net/ipg.*
+F:	drivers/net/ethernet/icplus/ipg.*
 
 IPATH DRIVER
 M:	Mike Marciniszyn <infinipath@qlogic.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 2607a44..bcf7368 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -522,16 +522,6 @@ menuconfig NETDEV_1000
 
 if NETDEV_1000
 
-config IP1000
-	tristate "IP1000 Gigabit Ethernet support"
-	depends on PCI && EXPERIMENTAL
-	select MII
-	---help---
-	  This driver supports IP1000 gigabit Ethernet cards.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called ipg.  This is recommended.
-
 endif # NETDEV_1000
 
 #
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 4c7af02..2fb039b 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -5,7 +5,6 @@
 obj-$(CONFIG_MII) += mii.o
 obj-$(CONFIG_MDIO) += mdio.o
 obj-$(CONFIG_PHYLIB) += phy/
-obj-$(CONFIG_IP1000) += ipg.o
 obj-$(CONFIG_CAN) += can/
 obj-$(CONFIG_BONDING) += bonding/
 obj-$(CONFIG_VMXNET3) += vmxnet3/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 922f4d1..72d0f5e 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -31,6 +31,7 @@ source "drivers/net/ethernet/ibm/Kconfig"
 source "drivers/net/ethernet/intel/Kconfig"
 source "drivers/net/ethernet/i825xx/Kconfig"
 source "drivers/net/ethernet/xscale/Kconfig"
+source "drivers/net/ethernet/icplus/Kconfig"
 
 config JME
 	tristate "JMicron(R) PCI-Express Gigabit Ethernet support"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index fcecd5f..a8d8913 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_NET_VENDOR_IBM) += ibm/
 obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
 obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/
 obj-$(CONFIG_NET_VENDOR_XSCALE) += xscale/
+obj-$(CONFIG_IP1000) += icplus/
 obj-$(CONFIG_JME) += jme.o
 obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/
 obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
diff --git a/drivers/net/ethernet/icplus/Kconfig b/drivers/net/ethernet/icplus/Kconfig
new file mode 100644
index 0000000..e888222
--- /dev/null
+++ b/drivers/net/ethernet/icplus/Kconfig
@@ -0,0 +1,13 @@
+#
+# IC Plus device configuration
+#
+
+config IP1000
+	tristate "IP1000 Gigabit Ethernet support"
+	depends on PCI && EXPERIMENTAL
+	select MII
+	---help---
+	  This driver supports IP1000 gigabit Ethernet cards.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called ipg.  This is recommended.
diff --git a/drivers/net/ethernet/icplus/Makefile b/drivers/net/ethernet/icplus/Makefile
new file mode 100644
index 0000000..5bc87c1
--- /dev/null
+++ b/drivers/net/ethernet/icplus/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the IC Plus device drivers
+#
+
+obj-$(CONFIG_IP1000) += ipg.o
diff --git a/drivers/net/ipg.c b/drivers/net/ethernet/icplus/ipg.c
similarity index 100%
rename from drivers/net/ipg.c
rename to drivers/net/ethernet/icplus/ipg.c
diff --git a/drivers/net/ipg.h b/drivers/net/ethernet/icplus/ipg.h
similarity index 100%
rename from drivers/net/ipg.h
rename to drivers/net/ethernet/icplus/ipg.h
-- 
1.7.6


^ permalink raw reply related

* [net-next 02/10] korina: Move the IDT driver
From: Jeff Kirsher @ 2011-08-12 19:45 UTC (permalink / raw)
  To: davem
  Cc: Jeff Kirsher, netdev, gospo, sassmann, IDT Inc., Felix Fietkau,
	Florian Fainelli
In-Reply-To: <1313178344-8168-1-git-send-email-jeffrey.t.kirsher@intel.com>

Move the IDT driver into drivers/net/ethernet/ and make the
necessary Kconfig and Makefile changes

CC: "IDT Inc." <rischelp@idt.com>
CC: Felix Fietkau <nbd@openwrt.org>
CC: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/Kconfig                 |    7 -------
 drivers/net/Makefile                |    1 -
 drivers/net/ethernet/Kconfig        |    7 +++++++
 drivers/net/ethernet/Makefile       |    1 +
 drivers/net/{ => ethernet}/korina.c |    0
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename drivers/net/{ => ethernet}/korina.c (100%)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index bcf7368..d9b3cb5 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -237,13 +237,6 @@ config MACB
 
 source "drivers/net/arm/Kconfig"
 
-config KORINA
-	tristate "Korina (IDT RC32434) Ethernet support"
-	depends on NET_ETHERNET && MIKROTIK_RB532
-	help
-	  If you have a Mikrotik RouterBoard 500 or IDT RC32434
-	  based system say Y. Otherwise say N.
-
 config MIPS_SIM_NET
 	tristate "MIPS simulator Network device"
 	depends on MIPS_SIM
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 2fb039b..6c17cb6 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -54,7 +54,6 @@ obj-$(CONFIG_MACVLAN) += macvlan.o
 obj-$(CONFIG_MACVTAP) += macvtap.o
 obj-$(CONFIG_DEFXX) += defxx.o
 obj-$(CONFIG_EQUALIZER) += eql.o
-obj-$(CONFIG_KORINA) += korina.o
 obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
 obj-$(CONFIG_TUN) += tun.o
 obj-$(CONFIG_VETH) += veth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 72d0f5e..dae10a3 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -45,6 +45,13 @@ config JME
 	  To compile this driver as a module, choose M here. The module
 	  will be called jme.
 
+config KORINA
+	tristate "Korina (IDT RC32434) Ethernet support"
+	depends on MIKROTIK_RB532
+	---help---
+	  If you have a Mikrotik RouterBoard 500 or IDT RC32434
+	  based system say Y. Otherwise say N.
+
 source "drivers/net/ethernet/marvell/Kconfig"
 source "drivers/net/ethernet/mellanox/Kconfig"
 source "drivers/net/ethernet/micrel/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index a8d8913..ddf097d 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -25,6 +25,7 @@ obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/
 obj-$(CONFIG_NET_VENDOR_XSCALE) += xscale/
 obj-$(CONFIG_IP1000) += icplus/
 obj-$(CONFIG_JME) += jme.o
+obj-$(CONFIG_KORINA) += korina.o
 obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/
 obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
 obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/
diff --git a/drivers/net/korina.c b/drivers/net/ethernet/korina.c
similarity index 100%
rename from drivers/net/korina.c
rename to drivers/net/ethernet/korina.c
-- 
1.7.6


^ permalink raw reply related

* [net-next 03/10] mipsnet: Move the MIPS driver
From: Jeff Kirsher @ 2011-08-12 19:45 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
In-Reply-To: <1313178344-8168-1-git-send-email-jeffrey.t.kirsher@intel.com>

Move the MIPS drivers into drivers/net/ethernet/ and
make the necessary Kconfig and Makefile changes.

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/Kconfig                  |    8 --------
 drivers/net/Makefile                 |    1 -
 drivers/net/ethernet/Kconfig         |    9 +++++++++
 drivers/net/ethernet/Makefile        |    1 +
 drivers/net/{ => ethernet}/mipsnet.c |    0
 5 files changed, 10 insertions(+), 9 deletions(-)
 rename drivers/net/{ => ethernet}/mipsnet.c (100%)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index d9b3cb5..d38cad2 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -237,14 +237,6 @@ config MACB
 
 source "drivers/net/arm/Kconfig"
 
-config MIPS_SIM_NET
-	tristate "MIPS simulator Network device"
-	depends on MIPS_SIM
-	help
-	  The MIPSNET device is a simple Ethernet network device which is
-	  emulated by the MIPS Simulator.
-	  If you are not using a MIPSsim or are unsure, say N.
-
 config SH_ETH
 	tristate "Renesas SuperH Ethernet support"
 	depends on SUPERH && \
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 6c17cb6..389c268 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -54,7 +54,6 @@ obj-$(CONFIG_MACVLAN) += macvlan.o
 obj-$(CONFIG_MACVTAP) += macvtap.o
 obj-$(CONFIG_DEFXX) += defxx.o
 obj-$(CONFIG_EQUALIZER) += eql.o
-obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
 obj-$(CONFIG_TUN) += tun.o
 obj-$(CONFIG_VETH) += veth.o
 obj-$(CONFIG_NET_NETX) += netx-eth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index dae10a3..f1509a5 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -55,6 +55,15 @@ config KORINA
 source "drivers/net/ethernet/marvell/Kconfig"
 source "drivers/net/ethernet/mellanox/Kconfig"
 source "drivers/net/ethernet/micrel/Kconfig"
+
+config MIPS_SIM_NET
+	tristate "MIPS simulator Network device"
+	depends on MIPS_SIM
+	---help---
+	  The MIPSNET device is a simple Ethernet network device which is
+	  emulated by the MIPS Simulator.
+	  If you are not using a MIPSsim or are unsure, say N.
+
 source "drivers/net/ethernet/myricom/Kconfig"
 source "drivers/net/ethernet/natsemi/Kconfig"
 source "drivers/net/ethernet/8390/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index ddf097d..50fc50a 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -29,6 +29,7 @@ obj-$(CONFIG_KORINA) += korina.o
 obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/
 obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
 obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/
+obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
 obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
 obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
 obj-$(CONFIG_NET_VENDOR_NUVOTON) += nuvoton/
diff --git a/drivers/net/mipsnet.c b/drivers/net/ethernet/mipsnet.c
similarity index 100%
rename from drivers/net/mipsnet.c
rename to drivers/net/ethernet/mipsnet.c
-- 
1.7.6


^ permalink raw reply related

* [net-next 04/10] lantiq: Move the Lantiq SoC driver
From: Jeff Kirsher @ 2011-08-12 19:45 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann, John Crispin
In-Reply-To: <1313178344-8168-1-git-send-email-jeffrey.t.kirsher@intel.com>

Move the Lantiq driver into drivers/net/ethernet/ and the
necessary Kconfig and Makefile changes.

CC: John Crispin <blogic@openwrt.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: John Crispin <blogic@openwrt.org>
---
 drivers/net/Kconfig                      |    6 ------
 drivers/net/Makefile                     |    1 -
 drivers/net/ethernet/Kconfig             |    6 ++++++
 drivers/net/ethernet/Makefile            |    1 +
 drivers/net/{ => ethernet}/lantiq_etop.c |    0
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename drivers/net/{ => ethernet}/lantiq_etop.c (100%)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index d38cad2..fd33380 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -478,12 +478,6 @@ config NET_POCKET
 	  the questions about this class of network devices. If you say Y, you
 	  will be asked for your specific device in the following questions.
 
-config LANTIQ_ETOP
-	tristate "Lantiq SoC ETOP driver"
-	depends on SOC_TYPE_XWAY
-	help
-	  Support for the MII0 inside the Lantiq SoC
-
 endif # NET_ETHERNET
 
 #
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 389c268..8e6dbd7 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -62,7 +62,6 @@ obj-$(CONFIG_DM9000) += dm9000.o
 obj-$(CONFIG_ENC28J60) += enc28j60.o
 obj-$(CONFIG_ETHOC) += ethoc.o
 obj-$(CONFIG_GRETH) += greth.o
-obj-$(CONFIG_LANTIQ_ETOP) += lantiq_etop.o
 
 obj-$(CONFIG_DNET) += dnet.o
 obj-$(CONFIG_MACB) += macb.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index f1509a5..6b3b3dc 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -52,6 +52,12 @@ config KORINA
 	  If you have a Mikrotik RouterBoard 500 or IDT RC32434
 	  based system say Y. Otherwise say N.
 
+config LANTIQ_ETOP
+	tristate "Lantiq SoC ETOP driver"
+	depends on SOC_TYPE_XWAY
+	---help---
+	  Support for the MII0 inside the Lantiq SoC
+
 source "drivers/net/ethernet/marvell/Kconfig"
 source "drivers/net/ethernet/mellanox/Kconfig"
 source "drivers/net/ethernet/micrel/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 50fc50a..2a1cbce 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -26,6 +26,7 @@ obj-$(CONFIG_NET_VENDOR_XSCALE) += xscale/
 obj-$(CONFIG_IP1000) += icplus/
 obj-$(CONFIG_JME) += jme.o
 obj-$(CONFIG_KORINA) += korina.o
+obj-$(CONFIG_LANTIQ_ETOP) += lantiq_etop.o
 obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/
 obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
 obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/
diff --git a/drivers/net/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
similarity index 100%
rename from drivers/net/lantiq_etop.c
rename to drivers/net/ethernet/lantiq_etop.c
-- 
1.7.6


^ permalink raw reply related

* [net-next 05/10] bfin_mac: Move the Analog Devices Inc driver
From: Jeff Kirsher @ 2011-08-12 19:45 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann, uclinux-dist-devel
In-Reply-To: <1313178344-8168-1-git-send-email-jeffrey.t.kirsher@intel.com>

Move the Analog Devices Inc driver into drivers/net/ethernet/adi/ and
make the necessary Kconfig and Makefile changes.

CC: <uclinux-dist-devel@blackfin.uclinux.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: Bob Liu <bob.liu@analog.com>
---
 MAINTAINERS                               |    2 +-
 drivers/net/Kconfig                       |   46 -------------------
 drivers/net/Makefile                      |    1 -
 drivers/net/ethernet/Kconfig              |    1 +
 drivers/net/ethernet/Makefile             |    1 +
 drivers/net/ethernet/adi/Kconfig          |   68 +++++++++++++++++++++++++++++
 drivers/net/ethernet/adi/Makefile         |    5 ++
 drivers/net/{ => ethernet/adi}/bfin_mac.c |    0
 drivers/net/{ => ethernet/adi}/bfin_mac.h |    0
 9 files changed, 76 insertions(+), 48 deletions(-)
 create mode 100644 drivers/net/ethernet/adi/Kconfig
 create mode 100644 drivers/net/ethernet/adi/Makefile
 rename drivers/net/{ => ethernet/adi}/bfin_mac.c (100%)
 rename drivers/net/{ => ethernet/adi}/bfin_mac.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 879c17e..15d7021 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1446,7 +1446,7 @@ BLACKFIN EMAC DRIVER
 L:	uclinux-dist-devel@blackfin.uclinux.org
 W:	http://blackfin.uclinux.org
 S:	Supported
-F:	drivers/net/bfin_mac.*
+F:	drivers/net/ethernet/adi/
 
 BLACKFIN RTC DRIVER
 M:	Mike Frysinger <vapier.adi@gmail.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index fd33380..10c25b5 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -252,52 +252,6 @@ config SH_ETH
 	  This driver supporting CPUs are:
 		- SH7710, SH7712, SH7763, SH7619, SH7724, and SH7757.
 
-config BFIN_MAC
-	tristate "Blackfin on-chip MAC support"
-	depends on NET_ETHERNET && (BF516 || BF518 || BF526 || BF527 || BF536 || BF537)
-	select CRC32
-	select MII
-	select PHYLIB
-	select BFIN_MAC_USE_L1 if DMA_UNCACHED_NONE
-	help
-	  This is the driver for Blackfin on-chip mac device. Say Y if you want it
-	  compiled into the kernel. This driver is also available as a module
-	  ( = code which can be inserted in and removed from the running kernel
-	  whenever you want). The module will be called bfin_mac.
-
-config BFIN_MAC_USE_L1
-	bool "Use L1 memory for rx/tx packets"
-	depends on BFIN_MAC && (BF527 || BF537)
-	default y
-	help
-	  To get maximum network performance, you should use L1 memory as rx/tx buffers.
-	  Say N here if you want to reserve L1 memory for other uses.
-
-config BFIN_TX_DESC_NUM
-	int "Number of transmit buffer packets"
-	depends on BFIN_MAC
-	range 6 10 if BFIN_MAC_USE_L1
-	range 10 100
-	default "10"
-	help
-	  Set the number of buffer packets used in driver.
-
-config BFIN_RX_DESC_NUM
-	int "Number of receive buffer packets"
-	depends on BFIN_MAC
-	range 20 100 if BFIN_MAC_USE_L1
-	range 20 800
-	default "20"
-	help
-	  Set the number of buffer packets used in driver.
-
-config BFIN_MAC_USE_HWSTAMP
-	bool "Use IEEE 1588 hwstamp"
-	depends on BFIN_MAC && BF518
-	default y
-	help
-	  To support the IEEE 1588 Precision Time Protocol (PTP), select y here
-
 config NET_NETX
 	tristate "NetX Ethernet support"
 	select MII
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 8e6dbd7..d249d76 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -57,7 +57,6 @@ obj-$(CONFIG_EQUALIZER) += eql.o
 obj-$(CONFIG_TUN) += tun.o
 obj-$(CONFIG_VETH) += veth.o
 obj-$(CONFIG_NET_NETX) += netx-eth.o
-obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
 obj-$(CONFIG_DM9000) += dm9000.o
 obj-$(CONFIG_ENC28J60) += enc28j60.o
 obj-$(CONFIG_ETHOC) += ethoc.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 6b3b3dc..e087337 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -15,6 +15,7 @@ source "drivers/net/ethernet/3com/Kconfig"
 source "drivers/net/ethernet/amd/Kconfig"
 source "drivers/net/ethernet/apple/Kconfig"
 source "drivers/net/ethernet/atheros/Kconfig"
+source "drivers/net/ethernet/adi/Kconfig"
 source "drivers/net/ethernet/broadcom/Kconfig"
 source "drivers/net/ethernet/brocade/Kconfig"
 source "drivers/net/ethernet/chelsio/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 2a1cbce..826db27 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -7,6 +7,7 @@ obj-$(CONFIG_NET_VENDOR_8390) += 8390/
 obj-$(CONFIG_NET_VENDOR_AMD) += amd/
 obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
 obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/
+obj-$(CONFIG_NET_BFIN) += adi/
 obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
 obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
diff --git a/drivers/net/ethernet/adi/Kconfig b/drivers/net/ethernet/adi/Kconfig
new file mode 100644
index 0000000..6de9851
--- /dev/null
+++ b/drivers/net/ethernet/adi/Kconfig
@@ -0,0 +1,68 @@
+#
+# Blackfin device configuration
+#
+
+config NET_BFIN
+	bool "Blackfin devices"
+	depends on BF516 || BF518 || BF526 || BF527 || BF536 || BF537
+	---help---
+	  If you have a network (Ethernet) card belonging to this class, say Y.
+	  Make sure you know the name of your card. Read the Ethernet-HOWTO,
+	  available from <http://www.tldp.org/docs.html#howto>.
+
+	  If unsure, say Y.
+
+	  Note that the answer to this question doesn't directly affect the
+	  kernel: saying N will just cause the configurator to skip all
+	  the remaining Blackfin card questions. If you say Y, you will be
+	  asked for your specific card in the following questions.
+
+if NET_BFIN
+
+config BFIN_MAC
+	tristate "Blackfin on-chip MAC support"
+	depends on (BF516 || BF518 || BF526 || BF527 || BF536 || BF537)
+	select CRC32
+	select MII
+	select PHYLIB
+	select BFIN_MAC_USE_L1 if DMA_UNCACHED_NONE
+	---help---
+	  This is the driver for Blackfin on-chip mac device. Say Y if you want
+	  it compiled into the kernel. This driver is also available as a
+	  module ( = code which can be inserted in and removed from the running
+	  kernel whenever you want). The module will be called bfin_mac.
+
+config BFIN_MAC_USE_L1
+	bool "Use L1 memory for rx/tx packets"
+	depends on BFIN_MAC && (BF527 || BF537)
+	default y
+	---help---
+	  To get maximum network performance, you should use L1 memory as rx/tx
+	  buffers. Say N here if you want to reserve L1 memory for other uses.
+
+config BFIN_TX_DESC_NUM
+	int "Number of transmit buffer packets"
+	depends on BFIN_MAC
+	range 6 10 if BFIN_MAC_USE_L1
+	range 10 100
+	default "10"
+	---help---
+	  Set the number of buffer packets used in driver.
+
+config BFIN_RX_DESC_NUM
+	int "Number of receive buffer packets"
+	depends on BFIN_MAC
+	range 20 100 if BFIN_MAC_USE_L1
+	range 20 800
+	default "20"
+	---help---
+	  Set the number of buffer packets used in driver.
+
+config BFIN_MAC_USE_HWSTAMP
+	bool "Use IEEE 1588 hwstamp"
+	depends on BFIN_MAC && BF518
+	default y
+	---help---
+	  To support the IEEE 1588 Precision Time Protocol (PTP), select y here
+
+endif # NET_BFIN
diff --git a/drivers/net/ethernet/adi/Makefile b/drivers/net/ethernet/adi/Makefile
new file mode 100644
index 0000000..b1fbe19
--- /dev/null
+++ b/drivers/net/ethernet/adi/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Blackfin device drivers.
+#
+
+obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
diff --git a/drivers/net/bfin_mac.c b/drivers/net/ethernet/adi/bfin_mac.c
similarity index 100%
rename from drivers/net/bfin_mac.c
rename to drivers/net/ethernet/adi/bfin_mac.c
diff --git a/drivers/net/bfin_mac.h b/drivers/net/ethernet/adi/bfin_mac.h
similarity index 100%
rename from drivers/net/bfin_mac.h
rename to drivers/net/ethernet/adi/bfin_mac.h
-- 
1.7.6


^ permalink raw reply related

* [net-next 06/10] macb: Move the Atmel driver
From: Jeff Kirsher @ 2011-08-12 19:45 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann, Nicolas Ferre, Jamie Iles
In-Reply-To: <1313178344-8168-1-git-send-email-jeffrey.t.kirsher@intel.com>

Move the Atmel driver into drivers/net/ethernet/cadence/ and
make the necessary Kconfig and Makefile changes.

CC: Nicolas Ferre <nicolas.ferre@atmel.com>
CC: Jamie Iles <jamie@jamieiles.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: Jamie Iles <jamie@jamieiles.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
 MAINTAINERS                                        |    2 +-
 drivers/net/Kconfig                                |   16 -------
 drivers/net/Makefile                               |    3 -
 drivers/net/arm/Kconfig                            |   12 -----
 drivers/net/arm/Makefile                           |    6 ---
 drivers/net/ethernet/Kconfig                       |    1 +
 drivers/net/ethernet/Makefile                      |    1 +
 drivers/net/ethernet/cadence/Kconfig               |   44 ++++++++++++++++++++
 drivers/net/ethernet/cadence/Makefile              |    6 +++
 drivers/net/{arm => ethernet/cadence}/at91_ether.c |    0
 drivers/net/{arm => ethernet/cadence}/at91_ether.h |    0
 drivers/net/{ => ethernet/cadence}/macb.c          |    0
 drivers/net/{ => ethernet/cadence}/macb.h          |    0
 13 files changed, 53 insertions(+), 38 deletions(-)
 delete mode 100644 drivers/net/arm/Kconfig
 delete mode 100644 drivers/net/arm/Makefile
 create mode 100644 drivers/net/ethernet/cadence/Kconfig
 create mode 100644 drivers/net/ethernet/cadence/Makefile
 rename drivers/net/{arm => ethernet/cadence}/at91_ether.c (100%)
 rename drivers/net/{arm => ethernet/cadence}/at91_ether.h (100%)
 rename drivers/net/{ => ethernet/cadence}/macb.c (100%)
 rename drivers/net/{ => ethernet/cadence}/macb.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 15d7021..ae60f8c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1323,7 +1323,7 @@ F:	include/video/atmel_lcdc.h
 ATMEL MACB ETHERNET DRIVER
 M:	Nicolas Ferre <nicolas.ferre@atmel.com>
 S:	Supported
-F:	drivers/net/macb.*
+F:	drivers/net/ethernet/cadence/
 
 ATMEL SPI DRIVER
 M:	Nicolas Ferre <nicolas.ferre@atmel.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 10c25b5..3f6622c 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2,9 +2,6 @@
 # Network device configuration
 #
 
-config HAVE_NET_MACB
-	bool
-
 menuconfig NETDEVICES
 	default y if UML
 	depends on NET
@@ -224,19 +221,6 @@ menuconfig NET_ETHERNET
 
 if NET_ETHERNET
 
-config MACB
-	tristate "Atmel MACB support"
-	depends on HAVE_NET_MACB
-	select PHYLIB
-	help
-	  The Atmel MACB ethernet interface is found on many AT32 and AT91
-	  parts. Say Y to include support for the MACB chip.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called macb.
-
-source "drivers/net/arm/Kconfig"
-
 config SH_ETH
 	tristate "Renesas SuperH Ethernet support"
 	depends on SUPERH && \
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index d249d76..d7873ba 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -63,9 +63,6 @@ obj-$(CONFIG_ETHOC) += ethoc.o
 obj-$(CONFIG_GRETH) += greth.o
 
 obj-$(CONFIG_DNET) += dnet.o
-obj-$(CONFIG_MACB) += macb.o
-
-obj-$(CONFIG_ARM) += arm/
 obj-$(CONFIG_DEV_APPLETALK) += appletalk/
 obj-$(CONFIG_ETHERNET) += ethernet/
 obj-$(CONFIG_TR) += tokenring/
diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig
deleted file mode 100644
index 57d16b9..0000000
--- a/drivers/net/arm/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Acorn Network device configuration
-#  These are for Acorn's Expansion card network interfaces
-#
-
-config ARM_AT91_ETHER
-	tristate "AT91RM9200 Ethernet support"
-	depends on ARM && ARCH_AT91RM9200
-	select MII
-	help
-	  If you wish to compile a kernel for the AT91RM9200 and enable
-	  ethernet support, then you should always answer Y to this.
diff --git a/drivers/net/arm/Makefile b/drivers/net/arm/Makefile
deleted file mode 100644
index fc0f85c..0000000
--- a/drivers/net/arm/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# File: drivers/net/arm/Makefile
-#
-# Makefile for the ARM network device drivers
-#
-
-obj-$(CONFIG_ARM_AT91_ETHER)	+= at91_ether.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index e087337..68a31b9 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -15,6 +15,7 @@ source "drivers/net/ethernet/3com/Kconfig"
 source "drivers/net/ethernet/amd/Kconfig"
 source "drivers/net/ethernet/apple/Kconfig"
 source "drivers/net/ethernet/atheros/Kconfig"
+source "drivers/net/ethernet/cadence/Kconfig"
 source "drivers/net/ethernet/adi/Kconfig"
 source "drivers/net/ethernet/broadcom/Kconfig"
 source "drivers/net/ethernet/brocade/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 826db27..0e91c4d 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -7,6 +7,7 @@ obj-$(CONFIG_NET_VENDOR_8390) += 8390/
 obj-$(CONFIG_NET_VENDOR_AMD) += amd/
 obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
 obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/
+obj-$(CONFIG_NET_ATMEL) += cadence/
 obj-$(CONFIG_NET_BFIN) += adi/
 obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
diff --git a/drivers/net/ethernet/cadence/Kconfig b/drivers/net/ethernet/cadence/Kconfig
new file mode 100644
index 0000000..c00e706
--- /dev/null
+++ b/drivers/net/ethernet/cadence/Kconfig
@@ -0,0 +1,44 @@
+#
+# Atmel device configuration
+#
+
+config HAVE_NET_MACB
+	bool
+
+config NET_ATMEL
+	bool "Atmel devices"
+	depends on HAVE_NET_MACB || (ARM && ARCH_AT91RM9200)
+	---help---
+	  If you have a network (Ethernet) card belonging to this class, say Y.
+	  Make sure you know the name of your card. Read the Ethernet-HOWTO,
+	  available from <http://www.tldp.org/docs.html#howto>.
+
+	  If unsure, say Y.
+
+	  Note that the answer to this question doesn't directly affect the
+	  kernel: saying N will just cause the configurator to skip all
+	  the remaining Atmel network card questions. If you say Y, you will be
+	  asked for your specific card in the following questions.
+
+if NET_ATMEL
+
+config ARM_AT91_ETHER
+	tristate "AT91RM9200 Ethernet support"
+	depends on ARM && ARCH_AT91RM9200
+	select MII
+	---help---
+	  If you wish to compile a kernel for the AT91RM9200 and enable
+	  ethernet support, then you should always answer Y to this.
+
+config MACB
+	tristate "Atmel MACB support"
+	depends on HAVE_NET_MACB
+	select PHYLIB
+	---help---
+	  The Atmel MACB ethernet interface is found on many AT32 and AT91
+	  parts. Say Y to include support for the MACB chip.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called macb.
+
+endif # NET_ATMEL
diff --git a/drivers/net/ethernet/cadence/Makefile b/drivers/net/ethernet/cadence/Makefile
new file mode 100644
index 0000000..9068b83
--- /dev/null
+++ b/drivers/net/ethernet/cadence/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the Atmel network device drivers.
+#
+
+obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o
+obj-$(CONFIG_MACB) += macb.o
diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/ethernet/cadence/at91_ether.c
similarity index 100%
rename from drivers/net/arm/at91_ether.c
rename to drivers/net/ethernet/cadence/at91_ether.c
diff --git a/drivers/net/arm/at91_ether.h b/drivers/net/ethernet/cadence/at91_ether.h
similarity index 100%
rename from drivers/net/arm/at91_ether.h
rename to drivers/net/ethernet/cadence/at91_ether.h
diff --git a/drivers/net/macb.c b/drivers/net/ethernet/cadence/macb.c
similarity index 100%
rename from drivers/net/macb.c
rename to drivers/net/ethernet/cadence/macb.c
diff --git a/drivers/net/macb.h b/drivers/net/ethernet/cadence/macb.h
similarity index 100%
rename from drivers/net/macb.h
rename to drivers/net/ethernet/cadence/macb.h
-- 
1.7.6


^ permalink raw reply related

* [net-next 07/10] r6040: Move the RDC driver
From: Jeff Kirsher @ 2011-08-12 19:45 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann, Florian Fainelli
In-Reply-To: <1313178344-8168-1-git-send-email-jeffrey.t.kirsher@intel.com>

Move the RDC driver into drivers/net/ethernet/rdc/ and make the
necessary Kconfig and Makefile changes.

CC: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                            |    2 +-
 drivers/net/Kconfig                    |   13 ------------
 drivers/net/Makefile                   |    1 -
 drivers/net/ethernet/Kconfig           |    1 +
 drivers/net/ethernet/Makefile          |    1 +
 drivers/net/ethernet/rdc/Kconfig       |   33 ++++++++++++++++++++++++++++++++
 drivers/net/ethernet/rdc/Makefile      |    5 ++++
 drivers/net/{ => ethernet/rdc}/r6040.c |    0
 8 files changed, 41 insertions(+), 15 deletions(-)
 create mode 100644 drivers/net/ethernet/rdc/Kconfig
 create mode 100644 drivers/net/ethernet/rdc/Makefile
 rename drivers/net/{ => ethernet/rdc}/r6040.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index ae60f8c..ca3ec84 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5343,7 +5343,7 @@ RDC R6040 FAST ETHERNET DRIVER
 M:	Florian Fainelli <florian@openwrt.org>
 L:	netdev@vger.kernel.org
 S:	Maintained
-F:	drivers/net/r6040.c
+F:	drivers/net/ethernet/rdc/r6040.c
 
 RDS - RELIABLE DATAGRAM SOCKETS
 M:	Andy Grover <andy.grover@oracle.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 3f6622c..ca3afb5 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -379,19 +379,6 @@ config FEALNX
 	  Say Y here to support the Myson MTD-800 family of PCI-based Ethernet 
 	  cards. <http://www.myson.com.tw/>
 
-config R6040
-	tristate "RDC R6040 Fast Ethernet Adapter support"
-	depends on NET_PCI && PCI
-	select CRC32
-	select MII
-	select PHYLIB
-	help
-	  This is a driver for the R6040 Fast Ethernet MACs found in the
-	  the RDC R-321x System-on-chips.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called r6040. This is recommended.
-
 config NET_POCKET
 	bool "Pocket and portable adapters"
 	depends on PARPORT
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index d7873ba..051439f 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -16,7 +16,6 @@ obj-$(CONFIG_PLIP) += plip.o
 
 obj-$(CONFIG_ROADRUNNER) += rrunner.o
 
-obj-$(CONFIG_R6040) += r6040.o
 obj-$(CONFIG_FEALNX) += fealnx.o
 obj-$(CONFIG_SKFP) += skfp/
 obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 68a31b9..78e567f 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -83,6 +83,7 @@ source "drivers/net/ethernet/pasemi/Kconfig"
 source "drivers/net/ethernet/qlogic/Kconfig"
 source "drivers/net/ethernet/racal/Kconfig"
 source "drivers/net/ethernet/realtek/Kconfig"
+source "drivers/net/ethernet/rdc/Kconfig"
 
 config S6GMAC
 	tristate "S6105 GMAC ethernet support"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 0e91c4d..48d3209 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -43,6 +43,7 @@ obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/
 obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
 obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
 obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/
+obj-$(CONFIG_NET_VENDOR_RDC) += rdc/
 obj-$(CONFIG_S6GMAC) += s6gmac.o
 obj-$(CONFIG_NET_VENDOR_SEEQ) += seeq/
 obj-$(CONFIG_NET_VENDOR_SIS) += sis/
diff --git a/drivers/net/ethernet/rdc/Kconfig b/drivers/net/ethernet/rdc/Kconfig
new file mode 100644
index 0000000..b15ebac
--- /dev/null
+++ b/drivers/net/ethernet/rdc/Kconfig
@@ -0,0 +1,33 @@
+#
+# RDC network device configuration
+#
+
+config NET_VENDOR_RDC
+	bool "RDC devices"
+	depends on PCI
+	---help---
+	  If you have a network (Ethernet) card belonging to this class, say Y
+	  and read the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  Note that the answer to this question doesn't directly affect the
+	  kernel: saying N will just cause the configurator to skip all
+	  the questions about RDC cards. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+if NET_VENDOR_RDC
+
+config R6040
+	tristate "RDC R6040 Fast Ethernet Adapter support"
+	depends on PCI
+	select CRC32
+	select MII
+	select PHYLIB
+	---help---
+	  This is a driver for the R6040 Fast Ethernet MACs found in the
+	  the RDC R-321x System-on-chips.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called r6040. This is recommended.
+
+endif # NET_VENDOR_RDC
diff --git a/drivers/net/ethernet/rdc/Makefile b/drivers/net/ethernet/rdc/Makefile
new file mode 100644
index 0000000..8d51fd2
--- /dev/null
+++ b/drivers/net/ethernet/rdc/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the RDC network device drivers.
+#
+
+obj-$(CONFIG_R6040) += r6040.o
diff --git a/drivers/net/r6040.c b/drivers/net/ethernet/rdc/r6040.c
similarity index 100%
rename from drivers/net/r6040.c
rename to drivers/net/ethernet/rdc/r6040.c
-- 
1.7.6


^ permalink raw reply related

* [net-next 08/10] fealnx: Move the Myson driver
From: Jeff Kirsher @ 2011-08-12 19:45 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann, Donald Becker
In-Reply-To: <1313178344-8168-1-git-send-email-jeffrey.t.kirsher@intel.com>

Move the Myson driver into drivers/net/ethernet/ and make the
necessary Kconfig and Makefile changes.

CC: Donald Becker <becker@scyld.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/Kconfig                 |    9 ---------
 drivers/net/Makefile                |    1 -
 drivers/net/ethernet/Kconfig        |   10 ++++++++++
 drivers/net/ethernet/Makefile       |    1 +
 drivers/net/{ => ethernet}/fealnx.c |    0
 5 files changed, 11 insertions(+), 10 deletions(-)
 rename drivers/net/{ => ethernet}/fealnx.c (100%)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index ca3afb5..754ddd2 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -370,15 +370,6 @@ config FORCEDETH
 	  To compile this driver as a module, choose M here. The module
 	  will be called forcedeth.
 
-config FEALNX
-	tristate "Myson MTD-8xx PCI Ethernet support"
-	depends on NET_PCI && PCI
-	select CRC32
-	select MII
-	help
-	  Say Y here to support the Myson MTD-800 family of PCI-based Ethernet 
-	  cards. <http://www.myson.com.tw/>
-
 config NET_POCKET
 	bool "Pocket and portable adapters"
 	depends on PARPORT
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 051439f..e11166a 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -16,7 +16,6 @@ obj-$(CONFIG_PLIP) += plip.o
 
 obj-$(CONFIG_ROADRUNNER) += rrunner.o
 
-obj-$(CONFIG_FEALNX) += fealnx.o
 obj-$(CONFIG_SKFP) += skfp/
 obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
 obj-$(CONFIG_RIONET) += rionet.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 78e567f..711297f 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -73,6 +73,16 @@ config MIPS_SIM_NET
 	  If you are not using a MIPSsim or are unsure, say N.
 
 source "drivers/net/ethernet/myricom/Kconfig"
+
+config FEALNX
+	tristate "Myson MTD-8xx PCI Ethernet support"
+	depends on PCI
+	select CRC32
+	select MII
+	---help---
+	  Say Y here to support the Myson MTD-800 family of PCI-based Ethernet
+	  cards. <http://www.myson.com.tw/>
+
 source "drivers/net/ethernet/natsemi/Kconfig"
 source "drivers/net/ethernet/8390/Kconfig"
 source "drivers/net/ethernet/nuvoton/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 48d3209..e30dde4 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -34,6 +34,7 @@ obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
 obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/
 obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
 obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
+obj-$(CONFIG_FEALNX) += fealnx.o
 obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
 obj-$(CONFIG_NET_VENDOR_NUVOTON) += nuvoton/
 obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/
diff --git a/drivers/net/fealnx.c b/drivers/net/ethernet/fealnx.c
similarity index 100%
rename from drivers/net/fealnx.c
rename to drivers/net/ethernet/fealnx.c
-- 
1.7.6


^ permalink raw reply related

* [net-next 09/10] forcedeth: Move the NVIDIA nForce driver
From: Jeff Kirsher @ 2011-08-12 19:45 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
In-Reply-To: <1313178344-8168-1-git-send-email-jeffrey.t.kirsher@intel.com>

Move the nForce driver into drivers/net/ethernet/nvidia/ and make
the necessary Kconfig and Makefile changes.

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/Kconfig                           |   11 ---------
 drivers/net/Makefile                          |    1 -
 drivers/net/ethernet/Kconfig                  |    1 +
 drivers/net/ethernet/Makefile                 |    1 +
 drivers/net/ethernet/nvidia/Kconfig           |   31 +++++++++++++++++++++++++
 drivers/net/ethernet/nvidia/Makefile          |    5 ++++
 drivers/net/{ => ethernet/nvidia}/forcedeth.c |    0
 7 files changed, 38 insertions(+), 12 deletions(-)
 create mode 100644 drivers/net/ethernet/nvidia/Kconfig
 create mode 100644 drivers/net/ethernet/nvidia/Makefile
 rename drivers/net/{ => ethernet/nvidia}/forcedeth.c (100%)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 754ddd2..c7953ad 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -359,17 +359,6 @@ config ADAPTEC_STARFIRE
 	  To compile this driver as a module, choose M here: the module
 	  will be called starfire.  This is recommended.
 
-config FORCEDETH
-	tristate "nForce Ethernet support"
-	depends on NET_PCI && PCI
-	help
-	  If you have a network (Ethernet) controller of this type, say Y and
-	  read the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called forcedeth.
-
 config NET_POCKET
 	bool "Pocket and portable adapters"
 	depends on PARPORT
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index e11166a..4d5af15 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -28,7 +28,6 @@ obj-$(CONFIG_SH_ETH) += sh_eth.o
 obj-$(CONFIG_NET) += Space.o loopback.o
 obj-$(CONFIG_NET_SB1000) += sb1000.o
 obj-$(CONFIG_HP100) += hp100.o
-obj-$(CONFIG_FORCEDETH) += forcedeth.o
 
 obj-$(CONFIG_PPP) += ppp_generic.o
 obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 711297f..1de8edc 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -86,6 +86,7 @@ config FEALNX
 source "drivers/net/ethernet/natsemi/Kconfig"
 source "drivers/net/ethernet/8390/Kconfig"
 source "drivers/net/ethernet/nuvoton/Kconfig"
+source "drivers/net/ethernet/nvidia/Kconfig"
 source "drivers/net/ethernet/octeon/Kconfig"
 source "drivers/net/ethernet/oki-semi/Kconfig"
 source "drivers/net/ethernet/packetengines/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index e30dde4..3d5ed1f 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -37,6 +37,7 @@ obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
 obj-$(CONFIG_FEALNX) += fealnx.o
 obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
 obj-$(CONFIG_NET_VENDOR_NUVOTON) += nuvoton/
+obj-$(CONFIG_NET_VENDOR_NVIDIA) += nvidia/
 obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/
 obj-$(CONFIG_NET_VENDOR_OKI) += oki-semi/
 obj-$(CONFIG_NET_PACKET_ENGINE) += packetengines/
diff --git a/drivers/net/ethernet/nvidia/Kconfig b/drivers/net/ethernet/nvidia/Kconfig
new file mode 100644
index 0000000..0a18e73
--- /dev/null
+++ b/drivers/net/ethernet/nvidia/Kconfig
@@ -0,0 +1,31 @@
+#
+# NVIDIA network device configuration
+#
+
+config NET_VENDOR_NVIDIA
+	bool "NVIDIA devices"
+	depends on PCI
+	---help---
+	  If you have a network (Ethernet) card belonging to this class, say Y
+	  and read the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  Note that the answer to this question doesn't directly affect the
+	  kernel: saying N will just cause the configurator to skip all
+	  the questions about NVIDIA cards. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+if NET_VENDOR_NVIDIA
+
+config FORCEDETH
+	tristate "nForce Ethernet support"
+	depends on PCI
+	---help---
+	  If you have a network (Ethernet) controller of this type, say Y and
+	  read the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called forcedeth.
+
+endif # NET_VENDOR_NVIDIA
diff --git a/drivers/net/ethernet/nvidia/Makefile b/drivers/net/ethernet/nvidia/Makefile
new file mode 100644
index 0000000..e079ae5
--- /dev/null
+++ b/drivers/net/ethernet/nvidia/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the NVIDIA network device drivers.
+#
+
+obj-$(CONFIG_FORCEDETH) += forcedeth.o
diff --git a/drivers/net/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c
similarity index 100%
rename from drivers/net/forcedeth.c
rename to drivers/net/ethernet/nvidia/forcedeth.c
-- 
1.7.6


^ permalink raw reply related

* [net-next 10/10] starfire: Move the Adaptec driver
From: Jeff Kirsher @ 2011-08-12 19:45 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann, Ion Badulescu
In-Reply-To: <1313178344-8168-1-git-send-email-jeffrey.t.kirsher@intel.com>

Move the Adaptec driver into drivers/net/ethernet/adaptec/ and make
the necessary Kconfig and Makefile changes.

CC: Ion Badulescu <ionut@badula.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                   |    2 +-
 drivers/net/Kconfig                           |   14 ----------
 drivers/net/Makefile                          |    1 -
 drivers/net/ethernet/Kconfig                  |    1 +
 drivers/net/ethernet/Makefile                 |    1 +
 drivers/net/ethernet/adaptec/Kconfig          |   34 +++++++++++++++++++++++++
 drivers/net/ethernet/adaptec/Makefile         |    5 +++
 drivers/net/{ => ethernet/adaptec}/starfire.c |    0
 8 files changed, 42 insertions(+), 16 deletions(-)
 create mode 100644 drivers/net/ethernet/adaptec/Kconfig
 create mode 100644 drivers/net/ethernet/adaptec/Makefile
 rename drivers/net/{ => ethernet/adaptec}/starfire.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index ca3ec84..8ca886e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6262,7 +6262,7 @@ F:	drivers/staging/xgifb/
 STARFIRE/DURALAN NETWORK DRIVER
 M:	Ion Badulescu <ionut@badula.org>
 S:	Odd Fixes
-F:	drivers/net/starfire*
+F:	drivers/net/ethernet/adaptec/starfire*
 
 SUN3/3X
 M:	Sam Creasey <sammy@sammy.net>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index c7953ad..e6e10a4 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -345,20 +345,6 @@ config NET_PCI
 	  will be asked for your specific card in the following questions. If
 	  you are unsure, say Y.
 
-config ADAPTEC_STARFIRE
-	tristate "Adaptec Starfire/DuraLAN support"
-	depends on NET_PCI && PCI
-	select CRC32
-	select MII
-	help
-	  Say Y here if you have an Adaptec Starfire (or DuraLAN) PCI network
-	  adapter. The DuraLAN chip is used on the 64 bit PCI boards from
-	  Adaptec e.g. the ANA-6922A. The older 32 bit boards use the tulip
-	  driver.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called starfire.  This is recommended.
-
 config NET_POCKET
 	bool "Pocket and portable adapters"
 	depends on PARPORT
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 4d5af15..670e175 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -17,7 +17,6 @@ obj-$(CONFIG_PLIP) += plip.o
 obj-$(CONFIG_ROADRUNNER) += rrunner.o
 
 obj-$(CONFIG_SKFP) += skfp/
-obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
 obj-$(CONFIG_RIONET) += rionet.o
 obj-$(CONFIG_SH_ETH) += sh_eth.o
 
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 1de8edc..8cd38c9 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -12,6 +12,7 @@ menuconfig ETHERNET
 if ETHERNET
 
 source "drivers/net/ethernet/3com/Kconfig"
+source "drivers/net/ethernet/adaptec/Kconfig"
 source "drivers/net/ethernet/amd/Kconfig"
 source "drivers/net/ethernet/apple/Kconfig"
 source "drivers/net/ethernet/atheros/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 3d5ed1f..50e040c 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -4,6 +4,7 @@
 
 obj-$(CONFIG_NET_VENDOR_3COM) += 3com/
 obj-$(CONFIG_NET_VENDOR_8390) += 8390/
+obj-$(CONFIG_NET_VENDOR_ADAPTEC) += adaptec/
 obj-$(CONFIG_NET_VENDOR_AMD) += amd/
 obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
 obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/
diff --git a/drivers/net/ethernet/adaptec/Kconfig b/drivers/net/ethernet/adaptec/Kconfig
new file mode 100644
index 0000000..5e9dbe9
--- /dev/null
+++ b/drivers/net/ethernet/adaptec/Kconfig
@@ -0,0 +1,34 @@
+#
+# Adaptec network device configuration
+#
+
+config NET_VENDOR_ADAPTEC
+	bool "Adaptec devices"
+	depends on PCI
+	---help---
+	  If you have a network (Ethernet) card belonging to this class, say Y
+	  and read the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  Note that the answer to this question doesn't directly affect the
+	  kernel: saying N will just cause the configurator to skip all
+	  the questions about Adaptec cards. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+if NET_VENDOR_ADAPTEC
+
+config ADAPTEC_STARFIRE
+	tristate "Adaptec Starfire/DuraLAN support"
+	depends on PCI
+	select CRC32
+	select MII
+	---help---
+	  Say Y here if you have an Adaptec Starfire (or DuraLAN) PCI network
+	  adapter. The DuraLAN chip is used on the 64 bit PCI boards from
+	  Adaptec e.g. the ANA-6922A. The older 32 bit boards use the tulip
+	  driver.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called starfire.  This is recommended.
+
+endif # NET_VENDOR_ADAPTEC
diff --git a/drivers/net/ethernet/adaptec/Makefile b/drivers/net/ethernet/adaptec/Makefile
new file mode 100644
index 0000000..6c07b75
--- /dev/null
+++ b/drivers/net/ethernet/adaptec/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Adaptec network device drivers.
+#
+
+obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
diff --git a/drivers/net/starfire.c b/drivers/net/ethernet/adaptec/starfire.c
similarity index 100%
rename from drivers/net/starfire.c
rename to drivers/net/ethernet/adaptec/starfire.c
-- 
1.7.6


^ permalink raw reply related

* Re: linux-next: Tree for Aug 12 (benet/be2net)
From: Randy Dunlap @ 2011-08-12 20:56 UTC (permalink / raw)
  To: Stephen Rothwell, netdev
  Cc: linux-next, LKML, Sathya Perla, Subbu Seetharaman, Ajit Khaparde
In-Reply-To: <20110812171311.4d7bb640f38838bf7c34df50@canb.auug.org.au>

On Fri, 12 Aug 2011 17:13:11 +1000 Stephen Rothwell wrote:

> Hi all,
> 
> [The kernel.org mirroring is being very slow today]

  [s.l.o.w.]
 
> The net tree gained a build failure do I used the version from
> next-20110811.


On i386:

drivers/built-in.o: In function `be_rx_eqd_update':
be_main.c:(.text+0x569229): undefined reference to `__udivdi3'


---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

^ permalink raw reply

* Re: linux-next: Tree for Aug 12 (benet/be2net)
From: Stephen Hemminger @ 2011-08-12 22:06 UTC (permalink / raw)
  To: Randy Dunlap
  Cc: Stephen Rothwell, netdev, linux-next, LKML, Sathya Perla,
	Subbu Seetharaman, Ajit Khaparde
In-Reply-To: <20110812135618.a209d9af.rdunlap@xenotime.net>

On Fri, 12 Aug 2011 13:56:18 -0700
Randy Dunlap <rdunlap@xenotime.net> wrote:

> On Fri, 12 Aug 2011 17:13:11 +1000 Stephen Rothwell wrote:
> 
> > Hi all,
> > 
> > [The kernel.org mirroring is being very slow today]
> 
>   [s.l.o.w.]
>  
> > The net tree gained a build failure do I used the version from
> > next-20110811.
> 
> 
> On i386:
> 
> drivers/built-in.o: In function `be_rx_eqd_update':
> be_main.c:(.text+0x569229): undefined reference to `__udivdi3'
> 

Already fixed:

Author: Eric Dumazet <eric.dumazet@gmail.com>  2011-08-08 23:23:07
Committer: David S. Miller <davem@davemloft.net>  2011-08-12 02:54:22
Parent: 9aebddd11be42366f89b0296590770c02797aa98 (be2net: Move the Emulex driver)
Branches: master, remotes/origin/master
Follows: v3.0
Precedes: 

    benet: fix build error on 32bit arch
    
    Error comes from commit ac124ff973e27802797
    (be2net: cleanup and refactor stats code)
    
    ERROR: "__udivdi3" [drivers/net/benet/be2net.ko] undefined!
    
    Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
    CC: Sathya Perla <sathya.perla@emulex.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

^ permalink raw reply

* Re: linux-next: Tree for Aug 12 (benet/be2net)
From: Randy Dunlap @ 2011-08-12 22:14 UTC (permalink / raw)
  To: Stephen Hemminger
  Cc: Stephen Rothwell, netdev, linux-next, LKML, Sathya Perla,
	Subbu Seetharaman, Ajit Khaparde
In-Reply-To: <20110812150607.2303e10e@nehalam.ftrdhcpuser.net>

On Fri, 12 Aug 2011 15:06:07 -0700 Stephen Hemminger wrote:

> On Fri, 12 Aug 2011 13:56:18 -0700
> Randy Dunlap <rdunlap@xenotime.net> wrote:
> 
> > On Fri, 12 Aug 2011 17:13:11 +1000 Stephen Rothwell wrote:
> > 
> > > Hi all,
> > > 
> > > [The kernel.org mirroring is being very slow today]
> > 
> >   [s.l.o.w.]
> >  
> > > The net tree gained a build failure do I used the version from
> > > next-20110811.
> > 
> > 
> > On i386:
> > 
> > drivers/built-in.o: In function `be_rx_eqd_update':
> > be_main.c:(.text+0x569229): undefined reference to `__udivdi3'
> > 
> 
> Already fixed:

That's really good news.  It appears to be re-b0rked
or this patch is not in linux-next yet.


> Author: Eric Dumazet <eric.dumazet@gmail.com>  2011-08-08 23:23:07
> Committer: David S. Miller <davem@davemloft.net>  2011-08-12 02:54:22
> Parent: 9aebddd11be42366f89b0296590770c02797aa98 (be2net: Move the Emulex driver)
> Branches: master, remotes/origin/master
> Follows: v3.0
> Precedes: 
> 
>     benet: fix build error on 32bit arch
>     
>     Error comes from commit ac124ff973e27802797
>     (be2net: cleanup and refactor stats code)
>     
>     ERROR: "__udivdi3" [drivers/net/benet/be2net.ko] undefined!
>     
>     Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
>     CC: Sathya Perla <sathya.perla@emulex.com>
>     Signed-off-by: David S. Miller <davem@davemloft.net>
> --


---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

^ permalink raw reply

* Re: [PATCH] bridge: mask forwarding of IEEE 802 local multicast groups
From: Ed Swierk @ 2011-08-12 22:37 UTC (permalink / raw)
  To: netdev
In-Reply-To: <CAF5U64C+WgQhfJL3zfVnvzE7p=G61humQCObHGUxAvY2-MGAFQ@mail.gmail.com>

Stephen Hemminger wrote:
> No.
> Don't like adding yet another hack user visible API which will have
> to be maintained for too long. But on the other hand I don't have
> a better solution at my finger tips. If better idea doesn't come
> along, then we can go with yours.

+1 for applying Nick Carter's patch adding a group_fwd_mask setting to
the bridge driver
(http://www.spinics.net/lists/netdev/msg169607.html).

I'm using elaborate combinations of bridges, tunnels and vlans to make
remote switches many hops away appear as though they're locally
connected to a virtual machine. In this application the bridges are
just used to forward traffic between a pair of interfaces. I need the
bridge to behave as much like a dumb 2-port hub as possible,
forwarding LLDP frames that 802.1d-compliant bridges normally drop.

I solemnly swear I will not pester the netdev list when I melt down my
LAN by inadvertently forwarding STP frames.

--Ed

^ permalink raw reply

page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox