* Re: [net-next RFC PATCH 4/7] tuntap: multiqueue support
From: Eric Dumazet @ 2011-08-12 14:29 UTC (permalink / raw)
To: Jason Wang
Cc: krkumar2, kvm, mst, qemu-devel, netdev, rusty, linux-kernel,
virtualization, mirq-linux, davem
In-Reply-To: <20110812015520.31613.99890.stgit@intel-e5620-16-2.englab.nay.redhat.com>
Le vendredi 12 août 2011 à 09:55 +0800, Jason Wang a écrit :
>+ rxq = skb_get_rxhash(skb);
>+ if (rxq) {
>+ tfile = rcu_dereference(tun->tfiles[rxq % numqueues]);
>+ if (tfile)
>+ goto out;
>+ }
You can avoid an expensive divide with following trick :
u32 idx = ((u64)rxq * numqueues) >> 32;
> -static struct tun_struct *tun_get(struct file *file)
> +static void tun_detach_all(struct net_device *dev)
> {
> - return __tun_get(file->private_data);
> + struct tun_struct *tun = netdev_priv(dev);
> + struct tun_file *tfile, *tfile_list[MAX_TAP_QUEUES];
> + int i, j = 0;
> +
> + spin_lock(&tun_lock);
> +
> + for (i = 0; i < MAX_TAP_QUEUES && tun->numqueues; i++) {
> + tfile = rcu_dereference_protected(tun->tfiles[i],
> + lockdep_is_held(&tun_lock));
> + if (tfile) {
> + wake_up_all(&tfile->wq.wait);
> + tfile_list[i++] = tfile;
typo here, you want tfile_list[j++] = tfile;
> + rcu_assign_pointer(tun->tfiles[i], NULL);
> + rcu_assign_pointer(tfile->tun, NULL);
> + --tun->numqueues;
> + }
> + }
> + BUG_ON(tun->numqueues != 0);
> + spin_unlock(&tun_lock);
> +
> + synchronize_rcu();
> + for(--j; j >= 0; j--)
> + sock_put(&tfile_list[j]->sk);
> }
>
Could you take a look at net/packet/af_packet.c, to check how David did
the whole fanout thing ?
__fanout_unlink()
Trick is to not leave NULL entries in the tun->tfiles[] array.
It makes things easier in hot path.
^ permalink raw reply
* Re: [PATCH] Fix RCU warning in rt_cache_seq_show
From: Paul E. McKenney @ 2011-08-12 12:49 UTC (permalink / raw)
To: Eric Dumazet; +Cc: Mark Rutland, netdev, David S. Miller, Gergely Kalman
In-Reply-To: <1313133830.2669.34.camel@edumazet-laptop>
On Fri, Aug 12, 2011 at 09:23:50AM +0200, Eric Dumazet wrote:
> Le jeudi 11 août 2011 à 19:32 -0700, Paul E. McKenney a écrit :
> > On Thu, Aug 11, 2011 at 06:58:21PM +0200, Eric Dumazet wrote:
> > > Le mercredi 10 août 2011 à 10:28 +0100, Mark Rutland a écrit :
> > > > > -----Original Message-----
> > > > > From: Eric Dumazet [mailto:eric.dumazet@gmail.com]
> > > > > Sent: 09 August 2011 18:19
> > > > > To: Mark Rutland; Paul E. McKenney
> > > > > Cc: netdev@vger.kernel.org; David S. Miller; Gergely Kalman
> > > > > Subject: Re: [PATCH] Fix RCU warning in rt_cache_seq_show
> > > > >
> > > > > Le mardi 09 août 2011 à 18:02 +0100, Mark Rutland a écrit :
> > > > > > Commit f2c31e32 ("net: fix NULL dereferences in check_peer_redir()")
> > > > > > added rcu protection to dst neighbour, and updated callsites for
> > > > > > dst_{get,set}_neighbour. Unfortunately, it missed rt_cache_seq_show.
> > > > > >
> > > > > > This produces a warning on v3.1-rc1 (on a preemptible kernel, on an
> > > > > > ARM Vexpress A9x4):
> > > > > >
> > > > > > ===================================================
> > > > > > [ INFO: suspicious rcu_dereference_check() usage. ]
> > > > > > ---------------------------------------------------
> > > > > > include/net/dst.h:91 invoked rcu_dereference_check() without
> > > > > protection!
> > > > > >
> > > > > > other info that might help us debug this:
> > > > > >
> > > > > > rcu_scheduler_active = 1, debug_locks = 0
> > > > > > 2 locks held by proc01/32159:
> > > > > >
> > > > > > stack backtrace:
> > > > > > [<80014880>] (unwind_backtrace+0x0/0xf8) from [<802e5c78>]
> > > > > (rt_cache_seq_show+0x18c/0x1c4)
> > > > > > [<802e5c78>] (rt_cache_seq_show+0x18c/0x1c4) from [<800e0c5c>]
> > > > > (seq_read+0x324/0x4a4)
> > > > > > [<800e0c5c>] (seq_read+0x324/0x4a4) from [<8010786c>]
> > > > > (proc_reg_read+0x70/0x94)
> > > > > > [<8010786c>] (proc_reg_read+0x70/0x94) from [<800c0ba8>]
> > > > > (vfs_read+0xb0/0x144)
> > > > > > [<800c0ba8>] (vfs_read+0xb0/0x144) from [<800c0ea8>]
> > > > > (sys_read+0x40/0x70)
> > > > > > [<800c0ea8>] (sys_read+0x40/0x70) from [<8000e0c0>]
> > > > > (ret_fast_syscall+0x0/0x3c)
> > > > > >
> > > > > > This patch adds calls to rcu_read_{lock,unlock} in rt_cache_seq_show,
> > > > > > protecting the dereferenced variable, and clearing the warning.
> > > > > >
> > > > > > Signed-off-by: Mark Rutland <mark.rutland@arm.com>
> > > > > > Cc: David S. Miller <davem@davemloft.net>
> > > > > > Cc: Eric Dumazet <eric.dumazet@gmail.com>
> > > > > > Cc: Gergely Kalman <synapse@hippy.csoma.elte.hu>
> > > > > > ---
> > > > > > net/ipv4/route.c | 2 ++
> > > > > > 1 files changed, 2 insertions(+), 0 deletions(-)
> > > > > >
> > > > > > diff --git a/net/ipv4/route.c b/net/ipv4/route.c
> > > > > > index e3dec1c..6699ef7 100644
> > > > > > --- a/net/ipv4/route.c
> > > > > > +++ b/net/ipv4/route.c
> > > > > > @@ -419,6 +419,7 @@ static int rt_cache_seq_show(struct seq_file
> > > > > *seq, void *v)
> > > > > > struct neighbour *n;
> > > > > > int len;
> > > > > >
> > > > > > + rcu_read_lock();
> > > > > > n = dst_get_neighbour(&r->dst);
> > > > > > seq_printf(seq, "%s\t%08X\t%08X\t%8X\t%d\t%u\t%d\t"
> > > > > > "%08X\t%d\t%u\t%u\t%02X\t%d\t%1d\t%08X%n",
> > > > > > @@ -435,6 +436,7 @@ static int rt_cache_seq_show(struct seq_file
> > > > > *seq, void *v)
> > > > > > -1,
> > > > > > (n && (n->nud_state & NUD_CONNECTED)) ? 1 : 0,
> > > > > > r->rt_spec_dst, &len);
> > > > > > + rcu_read_unlock();
> > > > > >
> > > > > > seq_printf(seq, "%*s\n", 127 - len, "");
> > > > > > }
> > > > >
> > > > >
> > > > > Hmm, I though rcu_read_lock_bh() (done by caller of this function) was
> > > > > protecting us here.
> > > >
> > > > Aha. Being a bit trigger-happy, I'd had a quick look at the functions
> > > > mentioned in the backtrace, and not looked at any possible inlining.
> > > >
> > > > This being my first real exposure to RCU, I wasn't aware of the *_bh
> > > > variants. Looking at the documentation (Documentation/RCU/checklist.txt),
> > > > I think the real problem is that we should be using rcu_dereference_bh in
> > > > this case:
> > > >
> > > > > read-side critical sections are delimited by rcu_read_lock()
> > > > > and rcu_read_unlock(), or by similar primitives such as
> > > > > rcu_read_lock_bh() and rcu_read_unlock_bh(), in which case
> > > > > the matching rcu_dereference() primitive must be used in order
> > > > > to keep lockdep happy, in this case, rcu_dereference_bh().
> > >
> > > Hmm.
> > >
> > > I do think dst_get_neighbour() should use rcu_dereference(), because
> > > dst->_neighbour are freed by call_rcu().
> > >
> > > The question is : Is following construct [A] safe or not ?
> > >
> > > {
> > > rcu_read_lock_bh();
> > > /* BH are now disabled, and we are not allowed to sleep */
> > > ...
> > >
> > > ptr = rcu_dereference();
> >
> > This should be:
> >
> > ptr = rcu_dereference_bh();
> >
> > As you say below. Never mind! ;-)
> >
> > > ...
> > > rcu_read_unlock_bh();
> > > }
> > >
> > >
> > > I dont really understand why lockdep wants [B] instead :
> > >
> > > {
> > > rcu_read_lock_bh();
> > > ...
> > >
> > > {
> > > rcu_read_lock();
> > > ptr = rcu_dereference();
> >
> > Here you are protected by both RCU and RCU-bh, so you should be able
> > to use either rcu_dereference() or rcu_dereference_bh(). A bit
> > strange to use rcu_dereference_bh(), though. Except perhaps if a
> > pointer to a function was passed in from the outer RCU-bh read-side
> > critical section or something.
> >
> > > rcu_read_unlock();
> > > }
> > > ...
> > > rcu_read_unlock_bh();
> > > }
> > >
> > >
> > >
> > > However, I can understand the other way [C], this is really needed :
> > >
> > > {
> > > rcu_read_lock();
> > > ...
> > >
> > > {
> > > rcu_read_lock_bh();
> > > ptr = rcu_dereference_bh();
> > > rcu_read_unlock_bh();
> > > }
> > > ...
> > > rcu_read_unlock();
> > > }
> > >
> > > I believe [A] should be allowed by lockdep.
> >
> > OK, I'll bite. Why?
> >
>
> Oh well, I assumed local_bh_disable() disables preemption.
>
> It does since day-0
> add_preempt_count(SOFTIRQ_DISABLE_OFFSET);
>
> So following should be safe :
>
> local_bh_disable();
> {
> ptr = rcu_dereference(...);
> use(ptr);
> }
> local_bh_enable();
>
> Maybe they are longterm plans to break this assumption, I dont know.
It would be safe for TINY_RCU and TREE_RCU, but not for either
TINY_PREEMPT_RCU or TREE_PREEMPT_RCU. These last two do not
recognize a preempt-disable region as an RCU read-side critical
section.
Thanx, Paul
^ permalink raw reply
* Re: Bridge stays down until a port is added
From: Sven-Haegar Koch @ 2011-08-12 12:22 UTC (permalink / raw)
To: Marc Haber; +Cc: Stephen Hemminger, netdev
In-Reply-To: <20110811205429.GB21307@torres.zugschlus.de>
On Thu, 11 Aug 2011, Marc Haber wrote:
> On Thu, Aug 11, 2011 at 08:17:06AM -0700, Stephen Hemminger wrote:
> > On Thu, 11 Aug 2011 09:06:59 +0200
> > Marc Haber <mh+netdev@zugschlus.de> wrote:
> > > Is that a feature? If so, why does the interface stay pingable after
> > > removing the dummy0 interface from the bridge?
> >
> > Yes, there are no links to send a packet so it seems logical
> > that there would be no carrier.
>
> Yes, but if I can configure an IP address to the bridge I would expect
> it to be reachable even if there are no interfaces in the bridge.
> "Older" kernels used to behave like that.
For me (using kernel 3.0.0) it seems to work as I expect it:
aurora:~# brctl addbr br0
aurora:~# ifconfig br0 192.168.254.1 netmask 255.255.255.0 up
aurora:~# ping 192.168.254.1
PING 192.168.254.1 (192.168.254.1) 56(84) bytes of data.
64 bytes from 192.168.254.1: icmp_req=1 ttl=64 time=0.087 ms
aurora:~# ifconfig br0
br0 Link encap:Ethernet HWaddr 96:e1:ba:9f:91:f9
inet addr:192.168.254.1 Bcast:192.168.254.255 Mask:255.255.255.0
UP BROADCAST MULTICAST MTU:1500 Metric:1
RX packets:0 errors:0 dropped:0 overruns:0 frame:0
TX packets:0 errors:0 dropped:0 overruns:0 carrier:0
collisions:0 txqueuelen:0
RX bytes:0 (0.0 B) TX bytes:0 (0.0 B)
The br0 interface has no carrier / is not "running", exactly like an
ethernet port without a cable.
c'ya
sven-haegar
--
Three may keep a secret, if two of them are dead.
- Ben F.
^ permalink raw reply
* Re: [PATCH v12 5/6] flexcan: Prefer device tree clock frequency if available.
From: Wolfgang Grandegger @ 2011-08-12 12:22 UTC (permalink / raw)
To: Robin Holt
Cc: Grant Likely, netdev-u79uwXL29TY76Z2rM5mHXA,
devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ, U Bhaskar-B22300,
Kumar Gala, socketcan-core-0fE9KPoRgkgATYTw5x5z8w,
Marc Kleine-Budde, Scott Wood, PPC list
In-Reply-To: <1313138752-24006-6-git-send-email-holt-sJ/iWh9BUns@public.gmane.org>
On 08/12/2011 10:45 AM, Robin Holt wrote:
> If our CAN device's device tree node has a clock-frequency property,
> then use that value for the can devices clock frequency. If not, fall
> back to asking the platform/mach code for the clock frequency associated
> with the flexcan device.
>
> Signed-off-by: Robin Holt <holt-sJ/iWh9BUns@public.gmane.org>
> To: Kumar Gala <galak-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org>
> To: Wolfgang Grandegger <wg-5Yr1BZd7O62+XT7JhA+gdA@public.gmane.org>,
> To: Marc Kleine-Budde <mkl-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>,
> To: U Bhaskar-B22300 <B22300-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
> To: Scott Wood <scottwood-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
> To: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
> Cc: socketcan-core-0fE9KPoRgkgATYTw5x5z8w@public.gmane.org,
> Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
> Cc: PPC list <linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org>
> Cc: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org
Acked-by: Wolfgang Grandegger <wg-5Yr1BZd7O62+XT7JhA+gdA@public.gmane.org>
>From the Socket-CAN point of view, this and the other patches can go in.
Thanks for your effort.
Wolfgang.
^ permalink raw reply
* Re: [PATCH] Proportional Rate Reduction for TCP.
From: Ilpo Järvinen @ 2011-08-12 11:36 UTC (permalink / raw)
To: Nandita Dukkipati
Cc: David S. Miller, Netdev, Tom Herbert, Yuchung Cheng, Matt Mathis
In-Reply-To: <1313134197-5082-1-git-send-email-nanditad@google.com>
> This patch implements Proportional Rate Reduction (PRR) for TCP.
> PRR is an algorithm that determines TCP's sending rate in fast
> recovery. PRR avoids excessive window reductions and aims for
> the actual congestion window size at the end of recovery to be as
> close as possible to the window determined by the congestion control
> algorithm. PRR also improves accuracy of the amount of data sent
> during loss recovery.
>
> The patch implements the recommended flavor of PRR called PRR-SSRB
> (Proportional rate reduction with slow start reduction bound) and
> replaces the existing rate halving algorithm. PRR improves upon the
> existing Linux fast recovery under a number of conditions including:
> 1) burst losses where the losses implicitly reduce the amount of
> outstanding data (pipe) below the ssthresh value selected by the
> congestion control algorithm and,
> 2) losses near the end of short flows where application runs out of
> data to send.
>
> As an example, with the existing rate halving implementation a single
> loss event can cause a connection carrying short Web transactions to
> go into the slow start mode after the recovery. This is because during
> recovery Linux pulls the congestion window down to packets_in_flight+1
> on every ACK. A short Web response often runs out of new data to send
> and its pipe reduces to zero by the end of recovery when all its packets
> are drained from the network. Subsequent HTTP responses using the same
> connection will have to slow start to raise cwnd to ssthresh. PRR on
> the other hand aims for the cwnd to be as close as possible to ssthresh
> by the end of recovery.
>
> A description of PRR and a discussion of its performance can be found at
> the following links:
> - IETF Draft:
> http://tools.ietf.org/html/draft-mathis-tcpm-proportional-rate-reduction-01
> - IETF Slides:
> http://www.ietf.org/proceedings/80/slides/tcpm-6.pdf
> http://tools.ietf.org/agenda/81/slides/tcpm-2.pdf
> - Paper to appear in Internet Measurements Conference (IMC) 2011:
> Improving TCP Loss Recovery
> Nandita Dukkipati, Matt Mathis, Yuchung Cheng
>
> Signed-off-by: Nandita Dukkipati <nanditad@google.com>
> ---
> include/linux/tcp.h | 4 +++
> net/ipv4/tcp_input.c | 63 ++++++++++++++++++++++++++++++++++++++++++++----
> net/ipv4/tcp_output.c | 7 ++++-
> 3 files changed, 67 insertions(+), 7 deletions(-)
>
> diff --git a/include/linux/tcp.h b/include/linux/tcp.h
> index 531ede8..dda4f2e1 100644
> --- a/include/linux/tcp.h
> +++ b/include/linux/tcp.h
> @@ -379,6 +379,10 @@ struct tcp_sock {
> u32 snd_cwnd_clamp; /* Do not allow snd_cwnd to grow above this */
> u32 snd_cwnd_used;
> u32 snd_cwnd_stamp;
> + u32 prr_cwnd; /* Congestion window at start of Recovery. */
> + u32 prr_delivered; /* Number of newly delivered packets to
> + * receiver in Recovery. */
> + u32 prr_out; /* Total number of pkts sent during Recovery. */
>
> u32 rcv_wnd; /* Current receiver window */
> u32 write_seq; /* Tail(+1) of data held in tcp send buffer */
> diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
> index ea0d218..601eff0 100644
> --- a/net/ipv4/tcp_input.c
> +++ b/net/ipv4/tcp_input.c
> @@ -2830,9 +2830,14 @@ static int tcp_try_undo_loss(struct sock *sk)
> static inline void tcp_complete_cwr(struct sock *sk)
> {
> struct tcp_sock *tp = tcp_sk(sk);
> - /* Do not moderate cwnd if it's already undone in cwr or recovery */
> - if (tp->undo_marker && tp->snd_cwnd > tp->snd_ssthresh) {
> - tp->snd_cwnd = tp->snd_ssthresh;
> +
> + /* Do not moderate cwnd if it's already undone in cwr or recovery. */
> + if (tp->undo_marker) {
> +
> + if (inet_csk(sk)->icsk_ca_state == TCP_CA_CWR)
> + tp->snd_cwnd = min(tp->snd_cwnd, tp->snd_ssthresh);
> + else /* PRR */
> + tp->snd_cwnd = tp->snd_ssthresh;
> tp->snd_cwnd_stamp = tcp_time_stamp;
> }
> tcp_ca_event(sk, CA_EVENT_COMPLETE_CWR);
> @@ -2950,6 +2955,39 @@ void tcp_simple_retransmit(struct sock *sk)
> }
> EXPORT_SYMBOL(tcp_simple_retransmit);
>
> +/* This function implements the PRR algorithm, specifcally the PRR-SSRB
> + * (proportional rate reduction with slow start reduction bound) as described in
> + * http://www.ietf.org/id/draft-mathis-tcpm-proportional-rate-reduction-01.txt.
> + * It computes the number of packets to send (sndcnt) based on packets newly
> + * delivered:
> + * 1) If the packets in flight is larger than ssthresh, PRR spreads the
> + * cwnd reductions across a full RTT.
> + * 2) If packets in flight is lower than ssthresh (such as due to excess
> + * losses and/or application stalls), do not perform any further cwnd
> + * reductions, but instead slow start up to ssthresh.
> + */
> +static void tcp_update_cwnd_in_recovery(struct sock *sk, int pkts_delivered,
> + int fast_rexmit, int flag)
> +{
> + struct tcp_sock *tp = tcp_sk(sk);
> + int sndcnt = 0;
> + int delta = tp->snd_ssthresh - tcp_packets_in_flight(tp);
> +
> + if (tcp_packets_in_flight(tp) > tp->snd_ssthresh) {
> + if (WARN_ON(!tp->prr_cwnd))
> + tp->prr_cwnd = 1;
Thanks, this made me to smile when I realized what kind of positive feedback
loop it would cause in a heavily congested environment :-). ...Perhaps any
value below 2 * tp->snd_ssthresh isn't that safe safety relief valve here.
...Of course this condition isn't ever hit with the current code base so
no real harm being done regardless of the value.
> + sndcnt = DIV_ROUND_UP(tp->prr_delivered * tp->snd_ssthresh,
> + tp->prr_cwnd) - tp->prr_out;
What about very large windows ...overflow?
Due to not having lower bound here, the resulting window can end up below
snd_ssthresh in one step if prr_delivered suddently jumps to a value that
is above prr_cnwd?
Also, snd_ssthresh and prr_cwnd are essentially constants over the
whole recovery and yet divide is needed whole the time. ...And in practically
all cases the proportion will be 0.5 (except for the odd number produced
off-by-one thing)?
> + } else {
> + sndcnt = min_t(int, delta,
> + max_t(int, tp->prr_delivered - tp->prr_out,
> + pkts_delivered) + 1);
> + }
> +
> + sndcnt = max(sndcnt, (fast_rexmit ? 1 : 0));
> + tp->snd_cwnd = tcp_packets_in_flight(tp) + sndcnt;
> +}
> +
> /* Process an event, which can update packets-in-flight not trivially.
> * Main goal of this function is to calculate new estimate for left_out,
> * taking into account both packets sitting in receiver's buffer and
> @@ -2961,7 +2999,8 @@ EXPORT_SYMBOL(tcp_simple_retransmit);
> * It does _not_ decide what to send, it is made in function
> * tcp_xmit_retransmit_queue().
> */
> -static void tcp_fastretrans_alert(struct sock *sk, int pkts_acked, int flag)
> +static void tcp_fastretrans_alert(struct sock *sk, int pkts_acked,
> + int pkts_delivered, int flag)
> {
> struct inet_connection_sock *icsk = inet_csk(sk);
> struct tcp_sock *tp = tcp_sk(sk);
> @@ -3111,13 +3150,17 @@ static void tcp_fastretrans_alert(struct sock *sk, int pkts_acked, int flag)
>
> tp->bytes_acked = 0;
> tp->snd_cwnd_cnt = 0;
> + tp->prr_cwnd = tp->snd_cwnd;
prior_cwnd would make this variable about 1000 times easier to read
without requiring some background.
While at it, I realized that there is some restore window place in the
generic code that assumes "prior_cwnd == 2 * tp->snd_ssthresh" which is
not true with every single cc module.
> + tp->prr_delivered = 0;
> + tp->prr_out = 0;
> tcp_set_ca_state(sk, TCP_CA_Recovery);
> fast_rexmit = 1;
> }
>
> if (do_lost || (tcp_is_fack(tp) && tcp_head_timedout(sk)))
> tcp_update_scoreboard(sk, fast_rexmit);
> - tcp_cwnd_down(sk, flag);
> + tp->prr_delivered += pkts_delivered;
...Is here a bug in the calculation if the recovery was triggered with
_a cumulative ACK_ that had enough SACK blocks?
> + tcp_update_cwnd_in_recovery(sk, pkts_delivered, fast_rexmit, flag);
> tcp_xmit_retransmit_queue(sk);
> }
>
> @@ -3632,6 +3675,11 @@ static int tcp_ack(struct sock *sk, struct sk_buff *skb, int flag)
> u32 prior_in_flight;
> u32 prior_fackets;
> int prior_packets;
> + int prior_sacked = tp->sacked_out;
> + /* pkts_delivered is number of packets newly cumulatively acked or
> + * sacked on this ACK.
> + */
> + int pkts_delivered = 0;
If you need a comment like that on variable declaration, maybe its name
could be more obvious, pkts_acked_sacked ?
> int frto_cwnd = 0;
>
> /* If the ack is older than previous acks
> @@ -3703,6 +3751,9 @@ static int tcp_ack(struct sock *sk, struct sk_buff *skb, int flag)
> /* See if we can take anything off of the retransmit queue. */
> flag |= tcp_clean_rtx_queue(sk, prior_fackets, prior_snd_una);
> + pkts_delivered = (prior_packets - prior_sacked) -
> + (tp->packets_out - tp->sacked_out);
> +
> if (tp->frto_counter)
> frto_cwnd = tcp_process_frto(sk, flag);
> /* Guarantee sacktag reordering detection against wrap-arounds */
> @@ -3715,7 +3766,7 @@ static int tcp_ack(struct sock *sk, struct sk_buff *skb, int flag)
> tcp_may_raise_cwnd(sk, flag))
> tcp_cong_avoid(sk, ack, prior_in_flight);
> tcp_fastretrans_alert(sk, prior_packets - tp->packets_out,
> - flag);
> + pkts_delivered, flag);
> } else {
> if ((flag & FLAG_DATA_ACKED) && !frto_cwnd)
> tcp_cong_avoid(sk, ack, prior_in_flight);
> diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
> index 882e0b0..ca50408 100644
> --- a/net/ipv4/tcp_output.c
> +++ b/net/ipv4/tcp_output.c
> @@ -1796,11 +1796,13 @@ static int tcp_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle,
> tcp_event_new_data_sent(sk, skb);
>
> tcp_minshall_update(tp, mss_now, skb);
> - sent_pkts++;
> + sent_pkts += tcp_skb_pcount(skb);
>
> if (push_one)
> break;
> }
> + if (inet_csk(sk)->icsk_ca_state == TCP_CA_Recovery)
> + tp->prr_out += sent_pkts;
Is there some harm done if you get rid of the conditionality?
> if (likely(sent_pkts)) {
> tcp_cwnd_validate(sk);
> @@ -2294,6 +2296,9 @@ begin_fwd:
> return;
> NET_INC_STATS_BH(sock_net(sk), mib_idx);
>
> + if (inet_csk(sk)->icsk_ca_state == TCP_CA_Recovery)
> + tp->prr_out += tcp_skb_pcount(skb);
> +
...same here?
> if (skb == tcp_write_queue_head(sk))
> inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,
> inet_csk(sk)->icsk_rto,
Besides the points above, I'm not convinced that we really need all the
across-packet state that is present, some relevant values should be
available before we do any ACK processing (in-flight, cwnd, and more
importantly, the difference between them). ...But I haven't yet
convinced myself of anything particular.
--
i.
^ permalink raw reply
* bridge: accept bridge own MAC address as local
From: Ulrich Weber @ 2011-08-12 11:30 UTC (permalink / raw)
To: davem; +Cc: netdev
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;
--
1.7.4.1
^ permalink raw reply related
* Re: [net-next 00/10] drivers/net organize Ethernet drivers (5th series)
From: David Miller @ 2011-08-12 11:35 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
In-Reply-To: <1313146371-6562-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Fri, 12 Aug 2011 03:52:41 -0700
> This is the fifth of seven 10 patch series to move the Ethernet
> drivers into drivers/net/ethernet/
>
> The following are changes since commit 4c78893b3d107e2a053c8f51c526510857c09858:
> cnic: Fix select dependencies in bnx2fc/bnx2i Kconfig.
> and are available in the git repository at:
> master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/next-organize master
Pulled, thanks Jeff.
^ permalink raw reply
* £980,000:00 Pound
From: info @ 2011-08-12 9:42 UTC (permalink / raw)
£980,000:00 Pound for more info Email: mrwilliam_garry@hotmail.com
^ permalink raw reply
* [net-next 10/10] xilinx/ll_temac: Move the Xilinx drivers
From: Jeff Kirsher @ 2011-08-12 10:52 UTC (permalink / raw)
To: davem
Cc: Jeff Kirsher, netdev, gospo, sassmann, John Williams,
David H. Lynch Jr.
In-Reply-To: <1313146371-6562-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the Xilinx drivers into drivers/net/ethernet/xilinx/ and
make the necessary Kconfig and Makefile changes.
CC: John Williams <john.williams@petalogix.com>
CC: "David H. Lynch Jr." <dhlii@dlasys.net>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/Kconfig | 15 --------
drivers/net/Makefile | 4 --
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/xilinx/Kconfig | 35 ++++++++++++++++++++
drivers/net/ethernet/xilinx/Makefile | 7 ++++
drivers/net/{ => ethernet/xilinx}/ll_temac.h | 0
drivers/net/{ => ethernet/xilinx}/ll_temac_main.c | 0
drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c | 0
.../net/{ => ethernet/xilinx}/xilinx_emaclite.c | 0
10 files changed, 44 insertions(+), 19 deletions(-)
create mode 100644 drivers/net/ethernet/xilinx/Kconfig
create mode 100644 drivers/net/ethernet/xilinx/Makefile
rename drivers/net/{ => ethernet/xilinx}/ll_temac.h (100%)
rename drivers/net/{ => ethernet/xilinx}/ll_temac_main.c (100%)
rename drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c (100%)
rename drivers/net/{ => ethernet/xilinx}/xilinx_emaclite.c (100%)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 996bae0..2607a44 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -493,13 +493,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 XILINX_EMACLITE
- tristate "Xilinx 10/100 Ethernet Lite support"
- depends on PPC32 || MICROBLAZE
- select PHYLIB
- help
- This driver supports the 10/100 Ethernet Lite from Xilinx.
-
config LANTIQ_ETOP
tristate "Lantiq SoC ETOP driver"
depends on SOC_TYPE_XWAY
@@ -539,14 +532,6 @@ config IP1000
To compile this driver as a module, choose M here: the module
will be called ipg. This is recommended.
-config XILINX_LL_TEMAC
- tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver"
- depends on PPC || MICROBLAZE
- select PHYLIB
- help
- This driver supports the Xilinx 10/100/1000 LocalLink TEMAC
- core used in Xilinx Spartan and Virtex FPGAs
-
endif # NETDEV_1000
#
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 271fc52..4c7af02 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -33,10 +33,6 @@ obj-$(CONFIG_NET_SB1000) += sb1000.o
obj-$(CONFIG_HP100) += hp100.o
obj-$(CONFIG_FORCEDETH) += forcedeth.o
-ll_temac-objs := ll_temac_main.o ll_temac_mdio.o
-obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o
-obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o
-
obj-$(CONFIG_PPP) += ppp_generic.o
obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index c29c145..922f4d1 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -82,5 +82,6 @@ source "drivers/net/ethernet/ti/Kconfig"
source "drivers/net/ethernet/toshiba/Kconfig"
source "drivers/net/ethernet/tundra/Kconfig"
source "drivers/net/ethernet/via/Kconfig"
+source "drivers/net/ethernet/xilinx/Kconfig"
endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 8495c50..fcecd5f 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -50,3 +50,4 @@ obj-$(CONFIG_NET_VENDOR_TI) += ti/
obj-$(CONFIG_NET_VENDOR_TOSHIBA) += toshiba/
obj-$(CONFIG_NET_VENDOR_TUNDRA) += tundra/
obj-$(CONFIG_NET_VENDOR_VIA) += via/
+obj-$(CONFIG_NET_VENDOR_XILINX) += xilinx/
diff --git a/drivers/net/ethernet/xilinx/Kconfig b/drivers/net/ethernet/xilinx/Kconfig
new file mode 100644
index 0000000..4e3aad4
--- /dev/null
+++ b/drivers/net/ethernet/xilinx/Kconfig
@@ -0,0 +1,35 @@
+#
+# Xilink device configuration
+#
+
+config NET_VENDOR_XILINX
+ bool "Xilinx devices"
+ depends on PPC || PPC32 || MICROBLAZE
+ ---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 Xilinx devices. If you say Y, you will be asked
+ for your specific card in the following questions.
+
+if NET_VENDOR_XILINX
+
+config XILINX_EMACLITE
+ tristate "Xilinx 10/100 Ethernet Lite support"
+ depends on (PPC32 || MICROBLAZE)
+ select PHYLIB
+ ---help---
+ This driver supports the 10/100 Ethernet Lite from Xilinx.
+
+config XILINX_LL_TEMAC
+ tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver"
+ depends on (PPC || MICROBLAZE)
+ select PHYLIB
+ ---help---
+ This driver supports the Xilinx 10/100/1000 LocalLink TEMAC
+ core used in Xilinx Spartan and Virtex FPGAs
+
+endif # NET_VENDOR_XILINX
diff --git a/drivers/net/ethernet/xilinx/Makefile b/drivers/net/ethernet/xilinx/Makefile
new file mode 100644
index 0000000..5feac73
--- /dev/null
+++ b/drivers/net/ethernet/xilinx/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for the Xilink network device drivers.
+#
+
+ll_temac-objs := ll_temac_main.o ll_temac_mdio.o
+obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o
+obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o
diff --git a/drivers/net/ll_temac.h b/drivers/net/ethernet/xilinx/ll_temac.h
similarity index 100%
rename from drivers/net/ll_temac.h
rename to drivers/net/ethernet/xilinx/ll_temac.h
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
similarity index 100%
rename from drivers/net/ll_temac_main.c
rename to drivers/net/ethernet/xilinx/ll_temac_main.c
diff --git a/drivers/net/ll_temac_mdio.c b/drivers/net/ethernet/xilinx/ll_temac_mdio.c
similarity index 100%
rename from drivers/net/ll_temac_mdio.c
rename to drivers/net/ethernet/xilinx/ll_temac_mdio.c
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
similarity index 100%
rename from drivers/net/xilinx_emaclite.c
rename to drivers/net/ethernet/xilinx/xilinx_emaclite.c
--
1.7.6
^ permalink raw reply related
* [net-next 09/10] jme: Move the JME driver
From: Jeff Kirsher @ 2011-08-12 10:52 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann, Guo-Fu Tseng
In-Reply-To: <1313146371-6562-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the JME driver into drivers/net/ethernet/ and make the
necessary Kconfig and Makefile changes.
CC: Guo-Fu Tseng <cooldavid@cooldavid.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 2 +-
drivers/net/Kconfig | 12 ------------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig | 13 +++++++++++++
drivers/net/ethernet/Makefile | 1 +
drivers/net/{ => ethernet}/jme.c | 0
drivers/net/{ => ethernet}/jme.h | 0
7 files changed, 15 insertions(+), 14 deletions(-)
rename drivers/net/{ => ethernet}/jme.c (100%)
rename drivers/net/{ => ethernet}/jme.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 622f4fc..37cbe14 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3591,7 +3591,7 @@ JME NETWORK DRIVER
M: Guo-Fu Tseng <cooldavid@cooldavid.org>
L: netdev@vger.kernel.org
S: Maintained
-F: drivers/net/jme.*
+F: drivers/net/ethernet/jme.*
JOURNALLING FLASH FILE SYSTEM V2 (JFFS2)
M: David Woodhouse <dwmw2@infradead.org>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index b896621..996bae0 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -547,18 +547,6 @@ config XILINX_LL_TEMAC
This driver supports the Xilinx 10/100/1000 LocalLink TEMAC
core used in Xilinx Spartan and Virtex FPGAs
-config JME
- tristate "JMicron(R) PCI-Express Gigabit Ethernet support"
- depends on PCI
- select CRC32
- select MII
- ---help---
- This driver supports the PCI-Express gigabit ethernet adapters
- based on JMicron JMC250 chipset.
-
- To compile this driver as a module, choose M here. The module
- will be called jme.
-
endif # NETDEV_1000
#
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 648fa5c..271fc52 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -8,7 +8,6 @@ obj-$(CONFIG_PHYLIB) += phy/
obj-$(CONFIG_IP1000) += ipg.o
obj-$(CONFIG_CAN) += can/
obj-$(CONFIG_BONDING) += bonding/
-obj-$(CONFIG_JME) += jme.o
obj-$(CONFIG_VMXNET3) += vmxnet3/
#
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 70c60ef..c29c145 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -31,6 +31,19 @@ source "drivers/net/ethernet/ibm/Kconfig"
source "drivers/net/ethernet/intel/Kconfig"
source "drivers/net/ethernet/i825xx/Kconfig"
source "drivers/net/ethernet/xscale/Kconfig"
+
+config JME
+ tristate "JMicron(R) PCI-Express Gigabit Ethernet support"
+ depends on PCI
+ select CRC32
+ select MII
+ ---help---
+ This driver supports the PCI-Express gigabit ethernet adapters
+ based on JMicron JMC250 chipset.
+
+ To compile this driver as a module, choose M here. The module
+ will be called jme.
+
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 929ee29..8495c50 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_JME) += jme.o
obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/
obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/
diff --git a/drivers/net/jme.c b/drivers/net/ethernet/jme.c
similarity index 100%
rename from drivers/net/jme.c
rename to drivers/net/ethernet/jme.c
diff --git a/drivers/net/jme.h b/drivers/net/ethernet/jme.h
similarity index 100%
rename from drivers/net/jme.h
rename to drivers/net/ethernet/jme.h
--
1.7.6
^ permalink raw reply related
* [net-next 08/10] octeon: Move the Cavium driver
From: Jeff Kirsher @ 2011-08-12 10:52 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann, David Daney
In-Reply-To: <1313146371-6562-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the Cavium driver to drivers/net/ethernet/octeon/ and
make the necessary Kconfig and Makefile changes.
CC: David Daney <david.daney@cavium.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: David Daney <david.daney@cavium.com>
---
drivers/net/Kconfig | 2 --
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/{ => ethernet}/octeon/Kconfig | 6 +++++-
drivers/net/ethernet/octeon/Makefile | 5 +++++
drivers/net/{ => ethernet}/octeon/octeon_mgmt.c | 0
drivers/net/octeon/Makefile | 2 --
8 files changed, 12 insertions(+), 6 deletions(-)
rename drivers/net/{ => ethernet}/octeon/Kconfig (85%)
create mode 100644 drivers/net/ethernet/octeon/Makefile
rename drivers/net/{ => ethernet}/octeon/octeon_mgmt.c (100%)
delete mode 100644 drivers/net/octeon/Makefile
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 99b209e..b896621 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -506,8 +506,6 @@ config LANTIQ_ETOP
help
Support for the MII0 inside the Lantiq SoC
-source "drivers/net/octeon/Kconfig"
-
endif # NET_ETHERNET
#
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index d8c286e..648fa5c 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -105,5 +105,4 @@ obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
obj-$(CONFIG_WIMAX) += wimax/
obj-$(CONFIG_CAIF) += caif/
-obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/
obj-$(CONFIG_TILE_NET) += tile/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 140dd73..70c60ef 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -38,6 +38,7 @@ source "drivers/net/ethernet/myricom/Kconfig"
source "drivers/net/ethernet/natsemi/Kconfig"
source "drivers/net/ethernet/8390/Kconfig"
source "drivers/net/ethernet/nuvoton/Kconfig"
+source "drivers/net/ethernet/octeon/Kconfig"
source "drivers/net/ethernet/oki-semi/Kconfig"
source "drivers/net/ethernet/packetengines/Kconfig"
source "drivers/net/ethernet/pasemi/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 8a97b19..929ee29 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -29,6 +29,7 @@ obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/
obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
obj-$(CONFIG_NET_VENDOR_NUVOTON) += nuvoton/
+obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/
obj-$(CONFIG_NET_VENDOR_OKI) += oki-semi/
obj-$(CONFIG_NET_PACKET_ENGINE) += packetengines/
obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/
diff --git a/drivers/net/octeon/Kconfig b/drivers/net/ethernet/octeon/Kconfig
similarity index 85%
rename from drivers/net/octeon/Kconfig
rename to drivers/net/ethernet/octeon/Kconfig
index 1e56bbf..3de52ff 100644
--- a/drivers/net/octeon/Kconfig
+++ b/drivers/net/ethernet/octeon/Kconfig
@@ -1,10 +1,14 @@
+#
+# Cavium network device configuration
+#
+
config OCTEON_MGMT_ETHERNET
tristate "Octeon Management port ethernet driver (CN5XXX, CN6XXX)"
depends on CPU_CAVIUM_OCTEON
select PHYLIB
select MDIO_OCTEON
default y
- help
+ ---help---
This option enables the ethernet driver for the management
port on Cavium Networks' Octeon CN57XX, CN56XX, CN55XX,
CN54XX, CN52XX, and CN6XXX chips.
diff --git a/drivers/net/ethernet/octeon/Makefile b/drivers/net/ethernet/octeon/Makefile
new file mode 100644
index 0000000..efa41c1
--- /dev/null
+++ b/drivers/net/ethernet/octeon/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Cavium network device drivers.
+#
+
+obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon_mgmt.o
diff --git a/drivers/net/octeon/octeon_mgmt.c b/drivers/net/ethernet/octeon/octeon_mgmt.c
similarity index 100%
rename from drivers/net/octeon/octeon_mgmt.c
rename to drivers/net/ethernet/octeon/octeon_mgmt.c
diff --git a/drivers/net/octeon/Makefile b/drivers/net/octeon/Makefile
deleted file mode 100644
index 906edec..0000000
--- a/drivers/net/octeon/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-
-obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon_mgmt.o
--
1.7.6
^ permalink raw reply related
* [net-next 07/10] hamachi/yellowfin: Move the packet engine drivers
From: Jeff Kirsher @ 2011-08-12 10:52 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann, Donald Becker
In-Reply-To: <1313146371-6562-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the packet engine drivers to drivers/net/ethernet/packetengines/
and 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 | 26 -----------
drivers/net/Makefile | 2 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/packetengines/Kconfig | 46 ++++++++++++++++++++
drivers/net/ethernet/packetengines/Makefile | 6 +++
drivers/net/{ => ethernet/packetengines}/hamachi.c | 0
.../net/{ => ethernet/packetengines}/yellowfin.c | 0
8 files changed, 54 insertions(+), 28 deletions(-)
create mode 100644 drivers/net/ethernet/packetengines/Kconfig
create mode 100644 drivers/net/ethernet/packetengines/Makefile
rename drivers/net/{ => ethernet/packetengines}/hamachi.c (100%)
rename drivers/net/{ => ethernet/packetengines}/yellowfin.c (100%)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index e8d65fe..99b209e 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -541,32 +541,6 @@ config IP1000
To compile this driver as a module, choose M here: the module
will be called ipg. This is recommended.
-config HAMACHI
- tristate "Packet Engines Hamachi GNIC-II support"
- depends on PCI
- select MII
- help
- If you have a Gigabit Ethernet card 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 hamachi.
-
-config YELLOWFIN
- tristate "Packet Engines Yellowfin Gigabit-NIC support (EXPERIMENTAL)"
- depends on PCI && EXPERIMENTAL
- select CRC32
- ---help---
- Say Y here if you have a Packet Engines G-NIC PCI Gigabit Ethernet
- adapter or the SYM53C885 Ethernet controller. The Gigabit adapter is
- used by the Beowulf Linux cluster project. See
- <http://cesdis.gsfc.nasa.gov/linux/drivers/yellowfin.html> for more
- information about this driver in particular and Beowulf in general.
-
- To compile this driver as a module, choose M here: the module
- will be called yellowfin. This is recommended.
-
config XILINX_LL_TEMAC
tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver"
depends on PPC || MICROBLAZE
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 96112dd..d8c286e 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -19,7 +19,6 @@ obj-$(CONFIG_PLIP) += plip.o
obj-$(CONFIG_ROADRUNNER) += rrunner.o
obj-$(CONFIG_R6040) += r6040.o
-obj-$(CONFIG_YELLOWFIN) += yellowfin.o
obj-$(CONFIG_FEALNX) += fealnx.o
obj-$(CONFIG_SKFP) += skfp/
obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
@@ -30,7 +29,6 @@ obj-$(CONFIG_SH_ETH) += sh_eth.o
# end link order section
#
-obj-$(CONFIG_HAMACHI) += hamachi.o
obj-$(CONFIG_NET) += Space.o loopback.o
obj-$(CONFIG_NET_SB1000) += sb1000.o
obj-$(CONFIG_HP100) += hp100.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 3983e70..140dd73 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -39,6 +39,7 @@ source "drivers/net/ethernet/natsemi/Kconfig"
source "drivers/net/ethernet/8390/Kconfig"
source "drivers/net/ethernet/nuvoton/Kconfig"
source "drivers/net/ethernet/oki-semi/Kconfig"
+source "drivers/net/ethernet/packetengines/Kconfig"
source "drivers/net/ethernet/pasemi/Kconfig"
source "drivers/net/ethernet/qlogic/Kconfig"
source "drivers/net/ethernet/racal/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 873d275..8a97b19 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -30,6 +30,7 @@ obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
obj-$(CONFIG_NET_VENDOR_NUVOTON) += nuvoton/
obj-$(CONFIG_NET_VENDOR_OKI) += oki-semi/
+obj-$(CONFIG_NET_PACKET_ENGINE) += packetengines/
obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
diff --git a/drivers/net/ethernet/packetengines/Kconfig b/drivers/net/ethernet/packetengines/Kconfig
new file mode 100644
index 0000000..4add1db
--- /dev/null
+++ b/drivers/net/ethernet/packetengines/Kconfig
@@ -0,0 +1,46 @@
+#
+# Packet engine device configuration
+#
+
+config NET_PACKET_ENGINE
+ bool "Packet Engine 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 packet engine devices. If you say Y, you will
+ be asked for your specific card in the following questions.
+
+if NET_PACKET_ENGINE
+
+config HAMACHI
+ tristate "Packet Engines Hamachi GNIC-II support"
+ depends on PCI
+ select MII
+ ---help---
+ If you have a Gigabit Ethernet card 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 hamachi.
+
+config YELLOWFIN
+ tristate "Packet Engines Yellowfin Gigabit-NIC support (EXPERIMENTAL)"
+ depends on PCI && EXPERIMENTAL
+ select CRC32
+ ---help---
+ Say Y here if you have a Packet Engines G-NIC PCI Gigabit Ethernet
+ adapter or the SYM53C885 Ethernet controller. The Gigabit adapter is
+ used by the Beowulf Linux cluster project. See
+ <http://cesdis.gsfc.nasa.gov/linux/drivers/yellowfin.html> for more
+ information about this driver in particular and Beowulf in general.
+
+ To compile this driver as a module, choose M here: the module
+ will be called yellowfin. This is recommended.
+
+endif # NET_PACKET_ENGINE
diff --git a/drivers/net/ethernet/packetengines/Makefile b/drivers/net/ethernet/packetengines/Makefile
new file mode 100644
index 0000000..995ccd0
--- /dev/null
+++ b/drivers/net/ethernet/packetengines/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the Packet Engine network device drivers.
+#
+
+obj-$(CONFIG_HAMACHI) += hamachi.o
+obj-$(CONFIG_YELLOWFIN) += yellowfin.o
diff --git a/drivers/net/hamachi.c b/drivers/net/ethernet/packetengines/hamachi.c
similarity index 100%
rename from drivers/net/hamachi.c
rename to drivers/net/ethernet/packetengines/hamachi.c
diff --git a/drivers/net/yellowfin.c b/drivers/net/ethernet/packetengines/yellowfin.c
similarity index 100%
rename from drivers/net/yellowfin.c
rename to drivers/net/ethernet/packetengines/yellowfin.c
--
1.7.6
^ permalink raw reply related
* [net-next 06/10] davinci*/tlan/cpmac: Move the Texas Instruments (TI) drivers
From: Jeff Kirsher @ 2011-08-12 10:52 UTC (permalink / raw)
To: davem
Cc: Jeff Kirsher, netdev, gospo, sassmann, Sriram, Vinay Hegde,
Cyril Chemparathy, Samuel Chessman, torben.mathiasen,
Eugene Konev, Florian Fainelli
In-Reply-To: <1313146371-6562-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the Texas Instruments drivers to drivers/net/ethernet/ti/ and
make the necessary Kconfig and Makefile changes.
CC: Sriram <srk@ti.com>
CC: Vinay Hegde <vinay.hegde@ti.com>
CC: Cyril Chemparathy <cyril@ti.com>
CC: Samuel Chessman <chessman@tux.org>
CC: <torben.mathiasen@compaq.com>
CC: Eugene Konev <ejka@imfi.kspu.ru>
CC: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 4 +-
drivers/net/Kconfig | 56 ------------------
drivers/net/Makefile | 7 --
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/ti/Kconfig | 76 +++++++++++++++++++++++++
drivers/net/ethernet/ti/Makefile | 9 +++
drivers/net/{ => ethernet/ti}/cpmac.c | 0
drivers/net/{ => ethernet/ti}/davinci_cpdma.c | 0
drivers/net/{ => ethernet/ti}/davinci_cpdma.h | 0
drivers/net/{ => ethernet/ti}/davinci_emac.c | 0
drivers/net/{ => ethernet/ti}/davinci_mdio.c | 0
drivers/net/{ => ethernet/ti}/tlan.c | 0
drivers/net/{ => ethernet/ti}/tlan.h | 0
14 files changed, 89 insertions(+), 65 deletions(-)
create mode 100644 drivers/net/ethernet/ti/Kconfig
create mode 100644 drivers/net/ethernet/ti/Makefile
rename drivers/net/{ => ethernet/ti}/cpmac.c (100%)
rename drivers/net/{ => ethernet/ti}/davinci_cpdma.c (100%)
rename drivers/net/{ => ethernet/ti}/davinci_cpdma.h (100%)
rename drivers/net/{ => ethernet/ti}/davinci_emac.c (100%)
rename drivers/net/{ => ethernet/ti}/davinci_mdio.c (100%)
rename drivers/net/{ => ethernet/ti}/tlan.c (100%)
rename drivers/net/{ => ethernet/ti}/tlan.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index d31fd9e..622f4fc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1908,7 +1908,7 @@ CPMAC ETHERNET DRIVER
M: Florian Fainelli <florian@openwrt.org>
L: netdev@vger.kernel.org
S: Maintained
-F: drivers/net/cpmac.c
+F: drivers/net/ethernet/ti/cpmac.c
CPU FREQUENCY DRIVERS
M: Dave Jones <davej@redhat.com>
@@ -6420,7 +6420,7 @@ L: tlan-devel@lists.sourceforge.net (subscribers-only)
W: http://sourceforge.net/projects/tlan/
S: Maintained
F: Documentation/networking/tlan.txt
-F: drivers/net/tlan.*
+F: drivers/net/ethernet/ti/tlan.*
TOMOYO SECURITY MODULE
M: Kentaro Takeda <takedakn@nttdata.co.jp>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 134c3a4..e8d65fe 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -323,37 +323,6 @@ config NET_NETX
To compile this driver as a module, choose M here. The module
will be called netx-eth.
-config TI_DAVINCI_EMAC
- tristate "TI DaVinci EMAC Support"
- depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )
- select TI_DAVINCI_MDIO
- select TI_DAVINCI_CPDMA
- select PHYLIB
- help
- This driver supports TI's DaVinci Ethernet .
-
- To compile this driver as a module, choose M here: the module
- will be called davinci_emac_driver. This is recommended.
-
-config TI_DAVINCI_MDIO
- tristate "TI DaVinci MDIO Support"
- depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )
- select PHYLIB
- help
- This driver supports TI's DaVinci MDIO module.
-
- To compile this driver as a module, choose M here: the module
- will be called davinci_mdio. This is recommended.
-
-config TI_DAVINCI_CPDMA
- tristate "TI DaVinci CPDMA Support"
- depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )
- help
- This driver supports TI's DaVinci CPDMA dma engine.
-
- To compile this driver as a module, choose M here: the module
- will be called davinci_cpdma. This is recommended.
-
config DM9000
tristate "DM9000 support"
depends on ARM || BLACKFIN || MIPS
@@ -500,31 +469,6 @@ config R6040
To compile this driver as a module, choose M here: the module
will be called r6040. This is recommended.
-config TLAN
- tristate "TI ThunderLAN support"
- depends on NET_PCI && (PCI || EISA)
- ---help---
- If you have a PCI Ethernet network card based on the ThunderLAN chip
- which is supported by this driver, say Y and read the
- Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>.
-
- Devices currently supported by this driver are Compaq Netelligent,
- Compaq NetFlex and Olicom cards. Please read the file
- <file:Documentation/networking/tlan.txt> for more details.
-
- To compile this driver as a module, choose M here. The module
- will be called tlan.
-
- Please email feedback to <torben.mathiasen@compaq.com>.
-
-config CPMAC
- tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"
- depends on NET_ETHERNET && EXPERIMENTAL && AR7
- select PHYLIB
- help
- TI AR7 CPMAC Ethernet support
-
config NET_POCKET
bool "Pocket and portable adapters"
depends on PARPORT
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 938484f..96112dd 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -5,11 +5,6 @@
obj-$(CONFIG_MII) += mii.o
obj-$(CONFIG_MDIO) += mdio.o
obj-$(CONFIG_PHYLIB) += phy/
-
-obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o
-obj-$(CONFIG_TI_DAVINCI_MDIO) += davinci_mdio.o
-obj-$(CONFIG_TI_DAVINCI_CPDMA) += davinci_cpdma.o
-
obj-$(CONFIG_IP1000) += ipg.o
obj-$(CONFIG_CAN) += can/
obj-$(CONFIG_BONDING) += bonding/
@@ -23,7 +18,6 @@ obj-$(CONFIG_PLIP) += plip.o
obj-$(CONFIG_ROADRUNNER) += rrunner.o
-obj-$(CONFIG_TLAN) += tlan.o
obj-$(CONFIG_R6040) += r6040.o
obj-$(CONFIG_YELLOWFIN) += yellowfin.o
obj-$(CONFIG_FEALNX) += fealnx.o
@@ -67,7 +61,6 @@ obj-$(CONFIG_IFB) += ifb.o
obj-$(CONFIG_MACVLAN) += macvlan.o
obj-$(CONFIG_MACVTAP) += macvtap.o
obj-$(CONFIG_DEFXX) += defxx.o
-obj-$(CONFIG_CPMAC) += cpmac.o
obj-$(CONFIG_EQUALIZER) += eql.o
obj-$(CONFIG_KORINA) += korina.o
obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index f53a4bc..3983e70 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -63,6 +63,7 @@ source "drivers/net/ethernet/smsc/Kconfig"
source "drivers/net/ethernet/stmicro/Kconfig"
source "drivers/net/ethernet/sun/Kconfig"
source "drivers/net/ethernet/tehuti/Kconfig"
+source "drivers/net/ethernet/ti/Kconfig"
source "drivers/net/ethernet/toshiba/Kconfig"
source "drivers/net/ethernet/tundra/Kconfig"
source "drivers/net/ethernet/via/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 4491d84..873d275 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -43,6 +43,7 @@ obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/
obj-$(CONFIG_NET_VENDOR_SUN) += sun/
obj-$(CONFIG_NET_VENDOR_TEHUTI) += tehuti/
+obj-$(CONFIG_NET_VENDOR_TI) += ti/
obj-$(CONFIG_NET_VENDOR_TOSHIBA) += toshiba/
obj-$(CONFIG_NET_VENDOR_TUNDRA) += tundra/
obj-$(CONFIG_NET_VENDOR_VIA) += via/
diff --git a/drivers/net/ethernet/ti/Kconfig b/drivers/net/ethernet/ti/Kconfig
new file mode 100644
index 0000000..1284319
--- /dev/null
+++ b/drivers/net/ethernet/ti/Kconfig
@@ -0,0 +1,76 @@
+#
+# TI device configuration
+#
+
+config NET_VENDOR_TI
+ bool "Texas Instruments (TI) devices"
+ depends on PCI || EISA || AR7 || (ARM && (ARCH_DAVINCI || ARCH_OMAP3))
+ ---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 TI devices. If you say Y, you will be asked for
+ your specific card in the following questions.
+
+if NET_VENDOR_TI
+
+config TI_DAVINCI_EMAC
+ tristate "TI DaVinci EMAC Support"
+ depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )
+ select TI_DAVINCI_MDIO
+ select TI_DAVINCI_CPDMA
+ select PHYLIB
+ ---help---
+ This driver supports TI's DaVinci Ethernet .
+
+ To compile this driver as a module, choose M here: the module
+ will be called davinci_emac_driver. This is recommended.
+
+config TI_DAVINCI_MDIO
+ tristate "TI DaVinci MDIO Support"
+ depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )
+ select PHYLIB
+ ---help---
+ This driver supports TI's DaVinci MDIO module.
+
+ To compile this driver as a module, choose M here: the module
+ will be called davinci_mdio. This is recommended.
+
+config TI_DAVINCI_CPDMA
+ tristate "TI DaVinci CPDMA Support"
+ depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )
+ ---help---
+ This driver supports TI's DaVinci CPDMA dma engine.
+
+ To compile this driver as a module, choose M here: the module
+ will be called davinci_cpdma. This is recommended.
+
+config TLAN
+ tristate "TI ThunderLAN support"
+ depends on (PCI || EISA)
+ ---help---
+ If you have a PCI Ethernet network card based on the ThunderLAN chip
+ which is supported by this driver, say Y and read the
+ Ethernet-HOWTO, available from
+ <http://www.tldp.org/docs.html#howto>.
+
+ Devices currently supported by this driver are Compaq Netelligent,
+ Compaq NetFlex and Olicom cards. Please read the file
+ <file:Documentation/networking/tlan.txt> for more details.
+
+ To compile this driver as a module, choose M here. The module
+ will be called tlan.
+
+ Please email feedback to <torben.mathiasen@compaq.com>.
+
+config CPMAC
+ tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"
+ depends on EXPERIMENTAL && AR7
+ select PHYLIB
+ ---help---
+ TI AR7 CPMAC Ethernet support
+
+endif # NET_VENDOR_TI
diff --git a/drivers/net/ethernet/ti/Makefile b/drivers/net/ethernet/ti/Makefile
new file mode 100644
index 0000000..aedb3af
--- /dev/null
+++ b/drivers/net/ethernet/ti/Makefile
@@ -0,0 +1,9 @@
+#
+# Makefile for the TI network device drivers.
+#
+
+obj-$(CONFIG_TLAN) += tlan.o
+obj-$(CONFIG_CPMAC) += cpmac.o
+obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o
+obj-$(CONFIG_TI_DAVINCI_MDIO) += davinci_mdio.o
+obj-$(CONFIG_TI_DAVINCI_CPDMA) += davinci_cpdma.o
diff --git a/drivers/net/cpmac.c b/drivers/net/ethernet/ti/cpmac.c
similarity index 100%
rename from drivers/net/cpmac.c
rename to drivers/net/ethernet/ti/cpmac.c
diff --git a/drivers/net/davinci_cpdma.c b/drivers/net/ethernet/ti/davinci_cpdma.c
similarity index 100%
rename from drivers/net/davinci_cpdma.c
rename to drivers/net/ethernet/ti/davinci_cpdma.c
diff --git a/drivers/net/davinci_cpdma.h b/drivers/net/ethernet/ti/davinci_cpdma.h
similarity index 100%
rename from drivers/net/davinci_cpdma.h
rename to drivers/net/ethernet/ti/davinci_cpdma.h
diff --git a/drivers/net/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c
similarity index 100%
rename from drivers/net/davinci_emac.c
rename to drivers/net/ethernet/ti/davinci_emac.c
diff --git a/drivers/net/davinci_mdio.c b/drivers/net/ethernet/ti/davinci_mdio.c
similarity index 100%
rename from drivers/net/davinci_mdio.c
rename to drivers/net/ethernet/ti/davinci_mdio.c
diff --git a/drivers/net/tlan.c b/drivers/net/ethernet/ti/tlan.c
similarity index 100%
rename from drivers/net/tlan.c
rename to drivers/net/ethernet/ti/tlan.c
diff --git a/drivers/net/tlan.h b/drivers/net/ethernet/ti/tlan.h
similarity index 100%
rename from drivers/net/tlan.h
rename to drivers/net/ethernet/ti/tlan.h
--
1.7.6
^ permalink raw reply related
* [net-next 05/10] s6gmac: Move the s6gmac drivers
From: Jeff Kirsher @ 2011-08-12 10:52 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann, Oskar Schirmer
In-Reply-To: <1313146371-6562-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the s6gmac driver to drivers/net/ethernet/ and
make the necessary Kconfig and Makefile changes.
CC: Oskar Schirmer <os@emlix.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/Kconfig | 11 -----------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig | 12 ++++++++++++
drivers/net/ethernet/Makefile | 1 +
drivers/net/{ => ethernet}/s6gmac.c | 0
5 files changed, 13 insertions(+), 12 deletions(-)
rename drivers/net/{ => ethernet}/s6gmac.c (100%)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index a96cf18..134c3a4 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -643,17 +643,6 @@ config JME
To compile this driver as a module, choose M here. The module
will be called jme.
-config S6GMAC
- tristate "S6105 GMAC ethernet support"
- depends on XTENSA_VARIANT_S6000
- select PHYLIB
- help
- This driver supports the on chip ethernet device on the
- S6105 xtensa processor.
-
- To compile this driver as a module, choose M here. The module
- will be called s6gmac.
-
endif # NETDEV_1000
#
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index d7ac2f8..938484f 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -83,7 +83,6 @@ obj-$(CONFIG_LANTIQ_ETOP) += lantiq_etop.o
obj-$(CONFIG_DNET) += dnet.o
obj-$(CONFIG_MACB) += macb.o
-obj-$(CONFIG_S6GMAC) += s6gmac.o
obj-$(CONFIG_ARM) += arm/
obj-$(CONFIG_DEV_APPLETALK) += appletalk/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 8f404ea..f53a4bc 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -43,6 +43,18 @@ source "drivers/net/ethernet/pasemi/Kconfig"
source "drivers/net/ethernet/qlogic/Kconfig"
source "drivers/net/ethernet/racal/Kconfig"
source "drivers/net/ethernet/realtek/Kconfig"
+
+config S6GMAC
+ tristate "S6105 GMAC ethernet support"
+ depends on XTENSA_VARIANT_S6000
+ select PHYLIB
+ ---help---
+ This driver supports the on chip ethernet device on the
+ S6105 xtensa processor.
+
+ To compile this driver as a module, choose M here. The module
+ will be called s6gmac.
+
source "drivers/net/ethernet/seeq/Kconfig"
source "drivers/net/ethernet/sis/Kconfig"
source "drivers/net/ethernet/sfc/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 6cf7f99..4491d84 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -34,6 +34,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_S6GMAC) += s6gmac.o
obj-$(CONFIG_NET_VENDOR_SEEQ) += seeq/
obj-$(CONFIG_NET_VENDOR_SIS) += sis/
obj-$(CONFIG_SFC) += sfc/
diff --git a/drivers/net/s6gmac.c b/drivers/net/ethernet/s6gmac.c
similarity index 100%
rename from drivers/net/s6gmac.c
rename to drivers/net/ethernet/s6gmac.c
--
1.7.6
^ permalink raw reply related
* [net-next 03/10] nuvoton: Move the Nuvoton driver
From: Jeff Kirsher @ 2011-08-12 10:52 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann, Wan ZongShun
In-Reply-To: <1313146371-6562-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the Nuvoton driver into drivers/net/ethernet/nuvoton/ and
make the necessary Kconfig and Makefile changes.
CC: Wan ZongShun <mcuos.com@gmail.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 2 +-
drivers/net/arm/Kconfig | 9 ------
drivers/net/arm/Makefile | 1 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/nuvoton/Kconfig | 29 ++++++++++++++++++++
drivers/net/ethernet/nuvoton/Makefile | 5 +++
.../net/{arm => ethernet/nuvoton}/w90p910_ether.c | 0
8 files changed, 37 insertions(+), 11 deletions(-)
create mode 100644 drivers/net/ethernet/nuvoton/Kconfig
create mode 100644 drivers/net/ethernet/nuvoton/Makefile
rename drivers/net/{arm => ethernet/nuvoton}/w90p910_ether.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index ee4ebb4..d31fd9e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1127,7 +1127,7 @@ F: arch/arm/mach-nuc93x/
F: drivers/input/keyboard/w90p910_keypad.c
F: drivers/input/touchscreen/w90p910_ts.c
F: drivers/watchdog/nuc900_wdt.c
-F: drivers/net/arm/w90p910_ether.c
+F: drivers/net/ethernet/nuvoton/w90p910_ether.c
F: drivers/mtd/nand/nuc900_nand.c
F: drivers/rtc/rtc-nuc900.c
F: drivers/spi/spi_nuc900.c
diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig
index fc94b4b..57d16b9 100644
--- a/drivers/net/arm/Kconfig
+++ b/drivers/net/arm/Kconfig
@@ -10,12 +10,3 @@ config ARM_AT91_ETHER
help
If you wish to compile a kernel for the AT91RM9200 and enable
ethernet support, then you should always answer Y to this.
-
-config W90P910_ETH
- tristate "Nuvoton w90p910 Ethernet support"
- depends on ARM && ARCH_W90X900
- select PHYLIB
- select MII
- help
- Say Y here if you want to use built-in Ethernet ports
- on w90p910 processor.
diff --git a/drivers/net/arm/Makefile b/drivers/net/arm/Makefile
index 462b3a4..fc0f85c 100644
--- a/drivers/net/arm/Makefile
+++ b/drivers/net/arm/Makefile
@@ -4,4 +4,3 @@
#
obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o
-obj-$(CONFIG_W90P910_ETH) += w90p910_ether.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index ff07408..3893065 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -37,6 +37,7 @@ source "drivers/net/ethernet/micrel/Kconfig"
source "drivers/net/ethernet/myricom/Kconfig"
source "drivers/net/ethernet/natsemi/Kconfig"
source "drivers/net/ethernet/8390/Kconfig"
+source "drivers/net/ethernet/nuvoton/Kconfig"
source "drivers/net/ethernet/oki-semi/Kconfig"
source "drivers/net/ethernet/pasemi/Kconfig"
source "drivers/net/ethernet/qlogic/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 3a17413..e1f0b94 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -28,6 +28,7 @@ obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/
obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
+obj-$(CONFIG_NET_VENDOR_NUVOTON) += nuvoton/
obj-$(CONFIG_NET_VENDOR_OKI) += oki-semi/
obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
diff --git a/drivers/net/ethernet/nuvoton/Kconfig b/drivers/net/ethernet/nuvoton/Kconfig
new file mode 100644
index 0000000..3b91c3b
--- /dev/null
+++ b/drivers/net/ethernet/nuvoton/Kconfig
@@ -0,0 +1,29 @@
+#
+# Nuvoton network device configuration
+#
+
+config NET_VENDOR_NUVOTON
+ bool "Nuvoton devices"
+ depends on ARM && ARCH_W90X900
+ ---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 Nuvoton cards. If you say Y, you will be asked
+ for your specific card in the following questions.
+
+if NET_VENDOR_NUVOTON
+
+config W90P910_ETH
+ tristate "Nuvoton w90p910 Ethernet support"
+ depends on ARM && ARCH_W90X900
+ select PHYLIB
+ select MII
+ ---help---
+ Say Y here if you want to use built-in Ethernet ports
+ on w90p910 processor.
+
+endif # NET_VENDOR_NUVOTON
diff --git a/drivers/net/ethernet/nuvoton/Makefile b/drivers/net/ethernet/nuvoton/Makefile
new file mode 100644
index 0000000..171aa04
--- /dev/null
+++ b/drivers/net/ethernet/nuvoton/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Nuvoton network device drivers.
+#
+
+obj-$(CONFIG_W90P910_ETH) += w90p910_ether.o
diff --git a/drivers/net/arm/w90p910_ether.c b/drivers/net/ethernet/nuvoton/w90p910_ether.c
similarity index 100%
rename from drivers/net/arm/w90p910_ether.c
rename to drivers/net/ethernet/nuvoton/w90p910_ether.c
--
1.7.6
^ permalink raw reply related
* [net-next 04/10] tsi108*: Move the Tundra driver
From: Jeff Kirsher @ 2011-08-12 10:52 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann, Kong Lai
In-Reply-To: <1313146371-6562-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the Tundra driver to drivers/net/ethernet/tundra/ and
make the necessary Kocnfig and Makefile changes.
CC: Kong Lai <kong.lai@tundra.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/Kconfig | 8 ------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/tundra/Kconfig | 28 ++++++++++++++++++++++++
drivers/net/ethernet/tundra/Makefile | 5 ++++
drivers/net/{ => ethernet/tundra}/tsi108_eth.c | 0
drivers/net/{ => ethernet/tundra}/tsi108_eth.h | 0
8 files changed, 35 insertions(+), 9 deletions(-)
create mode 100644 drivers/net/ethernet/tundra/Kconfig
create mode 100644 drivers/net/ethernet/tundra/Makefile
rename drivers/net/{ => ethernet/tundra}/tsi108_eth.c (100%)
rename drivers/net/{ => ethernet/tundra}/tsi108_eth.h (100%)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 33df254..a96cf18 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -623,14 +623,6 @@ config YELLOWFIN
To compile this driver as a module, choose M here: the module
will be called yellowfin. This is recommended.
-config TSI108_ETH
- tristate "Tundra TSI108 gigabit Ethernet support"
- depends on TSI108_BRIDGE
- help
- This driver supports Tundra TSI108 gigabit Ethernet ports.
- To compile this driver as a module, choose M here: the module
- will be called tsi108_eth.
-
config XILINX_LL_TEMAC
tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver"
depends on PPC || MICROBLAZE
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 3b14f1a..d7ac2f8 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -42,7 +42,6 @@ obj-$(CONFIG_NET_SB1000) += sb1000.o
obj-$(CONFIG_HP100) += hp100.o
obj-$(CONFIG_FORCEDETH) += forcedeth.o
-obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o
ll_temac-objs := ll_temac_main.o ll_temac_mdio.o
obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o
obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 3893065..8f404ea 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -52,6 +52,7 @@ source "drivers/net/ethernet/stmicro/Kconfig"
source "drivers/net/ethernet/sun/Kconfig"
source "drivers/net/ethernet/tehuti/Kconfig"
source "drivers/net/ethernet/toshiba/Kconfig"
+source "drivers/net/ethernet/tundra/Kconfig"
source "drivers/net/ethernet/via/Kconfig"
endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index e1f0b94..6cf7f99 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -43,4 +43,5 @@ obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/
obj-$(CONFIG_NET_VENDOR_SUN) += sun/
obj-$(CONFIG_NET_VENDOR_TEHUTI) += tehuti/
obj-$(CONFIG_NET_VENDOR_TOSHIBA) += toshiba/
+obj-$(CONFIG_NET_VENDOR_TUNDRA) += tundra/
obj-$(CONFIG_NET_VENDOR_VIA) += via/
diff --git a/drivers/net/ethernet/tundra/Kconfig b/drivers/net/ethernet/tundra/Kconfig
new file mode 100644
index 0000000..03925d1
--- /dev/null
+++ b/drivers/net/ethernet/tundra/Kconfig
@@ -0,0 +1,28 @@
+#
+# Tundra network device configuration
+#
+
+config NET_VENDOR_TUNDRA
+ bool "Tundra devices"
+ depends on TSI108_BRIDGE
+ ---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 Tundra cards. If you say Y, you will be asked for
+ your specific card in the following questions.
+
+if NET_VENDOR_TUNDRA
+
+config TSI108_ETH
+ tristate "Tundra TSI108 gigabit Ethernet support"
+ depends on TSI108_BRIDGE
+ ---help---
+ This driver supports Tundra TSI108 gigabit Ethernet ports.
+ To compile this driver as a module, choose M here: the module
+ will be called tsi108_eth.
+
+endif # NET_VENDOR_TUNDRA
diff --git a/drivers/net/ethernet/tundra/Makefile b/drivers/net/ethernet/tundra/Makefile
new file mode 100644
index 0000000..439f693
--- /dev/null
+++ b/drivers/net/ethernet/tundra/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Tundra network device drivers.
+#
+
+obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o
diff --git a/drivers/net/tsi108_eth.c b/drivers/net/ethernet/tundra/tsi108_eth.c
similarity index 100%
rename from drivers/net/tsi108_eth.c
rename to drivers/net/ethernet/tundra/tsi108_eth.c
diff --git a/drivers/net/tsi108_eth.h b/drivers/net/ethernet/tundra/tsi108_eth.h
similarity index 100%
rename from drivers/net/tsi108_eth.h
rename to drivers/net/ethernet/tundra/tsi108_eth.h
--
1.7.6
^ permalink raw reply related
* [net-next 02/10] cirrus: Move the Cirrus network driver
From: Jeff Kirsher @ 2011-08-12 10:52 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann, Hartley Sweeten
In-Reply-To: <1313146371-6562-1-git-send-email-jeffrey.t.kirsher@intel.com>
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%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 96a2d47..ee4ebb4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1768,7 +1768,7 @@ CIRRUS LOGIC EP93XX ETHERNET DRIVER
M: Hartley Sweeten <hsweeten@visionengravers.com>
L: netdev@vger.kernel.org
S: Maintained
-F: drivers/net/arm/ep93xx_eth.c
+F: drivers/net/ethernet/cirrus/ep93xx_eth.c
CIRRUS LOGIC EP93XX OHCI USB HOST DRIVER
M: Lennert Buytenhek <kernel@wantstofly.org>
diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig
index 4f748cc..fc94b4b 100644
--- a/drivers/net/arm/Kconfig
+++ b/drivers/net/arm/Kconfig
@@ -11,14 +11,6 @@ config ARM_AT91_ETHER
If you wish to compile a kernel for the AT91RM9200 and enable
ethernet support, then you should always answer Y to this.
-config EP93XX_ETH
- tristate "EP93xx Ethernet support"
- depends on ARM && ARCH_EP93XX
- select MII
- help
- This is a driver for the ethernet hardware included in EP93xx CPUs.
- Say Y if you are building a kernel for EP93xx based devices.
-
config W90P910_ETH
tristate "Nuvoton w90p910 Ethernet support"
depends on ARM && ARCH_W90X900
diff --git a/drivers/net/arm/Makefile b/drivers/net/arm/Makefile
index 316b06c..462b3a4 100644
--- a/drivers/net/arm/Makefile
+++ b/drivers/net/arm/Makefile
@@ -4,5 +4,4 @@
#
obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o
-obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o
obj-$(CONFIG_W90P910_ETH) += w90p910_ether.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index b15b1e2..ff07408 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -18,6 +18,7 @@ source "drivers/net/ethernet/atheros/Kconfig"
source "drivers/net/ethernet/broadcom/Kconfig"
source "drivers/net/ethernet/brocade/Kconfig"
source "drivers/net/ethernet/chelsio/Kconfig"
+source "drivers/net/ethernet/cirrus/Kconfig"
source "drivers/net/ethernet/cisco/Kconfig"
source "drivers/net/ethernet/dec/Kconfig"
source "drivers/net/ethernet/dlink/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 1f45ec9..3a17413 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/
obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
+obj-$(CONFIG_NET_VENDOR_CIRRUS) += cirrus/
obj-$(CONFIG_NET_VENDOR_CISCO) += cisco/
obj-$(CONFIG_NET_VENDOR_DEC) += dec/
obj-$(CONFIG_NET_VENDOR_DLINK) += dlink/
diff --git a/drivers/net/ethernet/cirrus/Kconfig b/drivers/net/ethernet/cirrus/Kconfig
new file mode 100644
index 0000000..53ebe78
--- /dev/null
+++ b/drivers/net/ethernet/cirrus/Kconfig
@@ -0,0 +1,28 @@
+#
+# Cirrus network device configuration
+#
+
+config NET_VENDOR_CIRRUS
+ bool "Cirrus devices"
+ depends on ARM && ARCH_EP93XX
+ ---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 Cirrus cards. If you say Y, you will be asked
+ for your specific card in the following questions.
+
+if NET_VENDOR_CIRRUS
+
+config EP93XX_ETH
+ tristate "EP93xx Ethernet support"
+ depends on ARM && ARCH_EP93XX
+ select MII
+ help
+ This is a driver for the ethernet hardware included in EP93xx CPUs.
+ Say Y if you are building a kernel for EP93xx based devices.
+
+endif # NET_VENDOR_CIRRUS
diff --git a/drivers/net/ethernet/cirrus/Makefile b/drivers/net/ethernet/cirrus/Makefile
new file mode 100644
index 0000000..9905ea2
--- /dev/null
+++ b/drivers/net/ethernet/cirrus/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Cirrus network device drivers.
+#
+
+obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o
diff --git a/drivers/net/arm/ep93xx_eth.c b/drivers/net/ethernet/cirrus/ep93xx_eth.c
similarity index 100%
rename from drivers/net/arm/ep93xx_eth.c
rename to drivers/net/ethernet/cirrus/ep93xx_eth.c
--
1.7.6
^ permalink raw reply related
* [net-next 01/10] sis*: Move the Silicon Integrated Systems (SiS) drivers
From: Jeff Kirsher @ 2011-08-12 10:52 UTC (permalink / raw)
To: davem
Cc: Jeff Kirsher, netdev, gospo, sassmann, Daniele Venzano,
Francois Romieu
In-Reply-To: <1313146371-6562-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the SiS drivers into drivers/net/ethernet/sis/ and make the
necessary Kconfig and Makefile changes
CC: Daniele Venzano <venza@brownhat.org>
CC: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 4 +-
drivers/net/Kconfig | 30 ------------------
drivers/net/Makefile | 2 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/sis/Kconfig | 50 +++++++++++++++++++++++++++++++
drivers/net/ethernet/sis/Makefile | 6 ++++
drivers/net/{ => ethernet/sis}/sis190.c | 0
drivers/net/{ => ethernet/sis}/sis900.c | 0
drivers/net/{ => ethernet/sis}/sis900.h | 0
10 files changed, 60 insertions(+), 34 deletions(-)
create mode 100644 drivers/net/ethernet/sis/Kconfig
create mode 100644 drivers/net/ethernet/sis/Makefile
rename drivers/net/{ => ethernet/sis}/sis190.c (100%)
rename drivers/net/{ => ethernet/sis}/sis900.c (100%)
rename drivers/net/{ => ethernet/sis}/sis900.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 84948bd..96a2d47 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5820,14 +5820,14 @@ SIS 190 ETHERNET DRIVER
M: Francois Romieu <romieu@fr.zoreil.com>
L: netdev@vger.kernel.org
S: Maintained
-F: drivers/net/sis190.c
+F: drivers/net/ethernet/sis/sis190.c
SIS 900/7016 FAST ETHERNET DRIVER
M: Daniele Venzano <venza@brownhat.org>
W: http://www.brownhat.org/sis900.html
L: netdev@vger.kernel.org
S: Maintained
-F: drivers/net/sis900.*
+F: drivers/net/ethernet/sis/sis900.*
SIS 96X I2C/SMBUS DRIVER
M: "Mark M. Hoffman" <mhoffman@lightlink.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 1e1df3d..33df254 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -500,22 +500,6 @@ config R6040
To compile this driver as a module, choose M here: the module
will be called r6040. This is recommended.
-config SIS900
- tristate "SiS 900/7016 PCI Fast Ethernet Adapter support"
- depends on NET_PCI && PCI
- select CRC32
- select MII
- ---help---
- This is a driver for the Fast Ethernet PCI network cards based on
- the SiS 900 and SiS 7016 chips. The SiS 900 core is also embedded in
- SiS 630 and SiS 540 chipsets.
-
- This driver also supports AMD 79C901 HomePNA so that you can use
- your phone line as a network cable.
-
- To compile this driver as a module, choose M here: the module
- will be called sis900. This is recommended.
-
config TLAN
tristate "TI ThunderLAN support"
depends on NET_PCI && (PCI || EISA)
@@ -639,20 +623,6 @@ config YELLOWFIN
To compile this driver as a module, choose M here: the module
will be called yellowfin. This is recommended.
-config SIS190
- tristate "SiS190/SiS191 gigabit ethernet support"
- depends on PCI
- select CRC32
- select MII
- ---help---
- Say Y here if you have a SiS 190 PCI Fast Ethernet adapter or
- a SiS 191 PCI Gigabit Ethernet adapter. Both are expected to
- appear in lan on motherboard designs which are based on SiS 965
- and SiS 966 south bridge.
-
- To compile this driver as a module, choose M here: the module
- will be called sis190. This is recommended.
-
config TSI108_ETH
tristate "Tundra TSI108 gigabit Ethernet support"
depends on TSI108_BRIDGE
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 275ed4a..3b14f1a 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -24,8 +24,6 @@ obj-$(CONFIG_PLIP) += plip.o
obj-$(CONFIG_ROADRUNNER) += rrunner.o
obj-$(CONFIG_TLAN) += tlan.o
-obj-$(CONFIG_SIS190) += sis190.o
-obj-$(CONFIG_SIS900) += sis900.o
obj-$(CONFIG_R6040) += r6040.o
obj-$(CONFIG_YELLOWFIN) += yellowfin.o
obj-$(CONFIG_FEALNX) += fealnx.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 9754247..b15b1e2 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -42,6 +42,7 @@ source "drivers/net/ethernet/qlogic/Kconfig"
source "drivers/net/ethernet/racal/Kconfig"
source "drivers/net/ethernet/realtek/Kconfig"
source "drivers/net/ethernet/seeq/Kconfig"
+source "drivers/net/ethernet/sis/Kconfig"
source "drivers/net/ethernet/sfc/Kconfig"
source "drivers/net/ethernet/sgi/Kconfig"
source "drivers/net/ethernet/smsc/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 7e7a319..1f45ec9 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -33,6 +33,7 @@ obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/
obj-$(CONFIG_NET_VENDOR_SEEQ) += seeq/
+obj-$(CONFIG_NET_VENDOR_SIS) += sis/
obj-$(CONFIG_SFC) += sfc/
obj-$(CONFIG_NET_VENDOR_SGI) += sgi/
obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
diff --git a/drivers/net/ethernet/sis/Kconfig b/drivers/net/ethernet/sis/Kconfig
new file mode 100644
index 0000000..01d43e8
--- /dev/null
+++ b/drivers/net/ethernet/sis/Kconfig
@@ -0,0 +1,50 @@
+#
+# Silicon Integrated Systems (SiS) device configuration
+#
+
+config NET_VENDOR_SIS
+ bool "Silicon Integrated Systems (SiS) 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 SiS devices. If you say Y, you will be asked for
+ your specific card in the following questions.
+
+if NET_VENDOR_SIS
+
+config SIS900
+ tristate "SiS 900/7016 PCI Fast Ethernet Adapter support"
+ depends on PCI
+ select CRC32
+ select MII
+ ---help---
+ This is a driver for the Fast Ethernet PCI network cards based on
+ the SiS 900 and SiS 7016 chips. The SiS 900 core is also embedded in
+ SiS 630 and SiS 540 chipsets.
+
+ This driver also supports AMD 79C901 HomePNA so that you can use
+ your phone line as a network cable.
+
+ To compile this driver as a module, choose M here: the module
+ will be called sis900. This is recommended.
+
+config SIS190
+ tristate "SiS190/SiS191 gigabit ethernet support"
+ depends on PCI
+ select CRC32
+ select MII
+ ---help---
+ Say Y here if you have a SiS 190 PCI Fast Ethernet adapter or
+ a SiS 191 PCI Gigabit Ethernet adapter. Both are expected to
+ appear in lan on motherboard designs which are based on SiS 965
+ and SiS 966 south bridge.
+
+ To compile this driver as a module, choose M here: the module
+ will be called sis190. This is recommended.
+
+endif # NET_VENDOR_SIS
diff --git a/drivers/net/ethernet/sis/Makefile b/drivers/net/ethernet/sis/Makefile
new file mode 100644
index 0000000..58d3ac1
--- /dev/null
+++ b/drivers/net/ethernet/sis/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for Silicon Integrated Systems (SiS) network device drivers.
+#
+
+obj-$(CONFIG_SIS190) += sis190.o
+obj-$(CONFIG_SIS900) += sis900.o
diff --git a/drivers/net/sis190.c b/drivers/net/ethernet/sis/sis190.c
similarity index 100%
rename from drivers/net/sis190.c
rename to drivers/net/ethernet/sis/sis190.c
diff --git a/drivers/net/sis900.c b/drivers/net/ethernet/sis/sis900.c
similarity index 100%
rename from drivers/net/sis900.c
rename to drivers/net/ethernet/sis/sis900.c
diff --git a/drivers/net/sis900.h b/drivers/net/ethernet/sis/sis900.h
similarity index 100%
rename from drivers/net/sis900.h
rename to drivers/net/ethernet/sis/sis900.h
--
1.7.6
^ permalink raw reply related
* [net-next 00/10] drivers/net organize Ethernet drivers (5th series)
From: Jeff Kirsher @ 2011-08-12 10:52 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This is the fifth of seven 10 patch series to move the Ethernet
drivers into drivers/net/ethernet/
The following are changes since commit 4c78893b3d107e2a053c8f51c526510857c09858:
cnic: Fix select dependencies in bnx2fc/bnx2i Kconfig.
and are available in the git repository at:
master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/next-organize master
Jeff Kirsher (10):
sis*: Move the Silicon Integrated Systems (SiS) drivers
cirrus: Move the Cirrus network driver
nuvoton: Move the Nuvoton driver
tsi108*: Move the Tundra driver
s6gmac: Move the s6gmac drivers
davinci*/tlan/cpmac: Move the Texas Instruments (TI) drivers
hamachi/yellowfin: Move the packet engine drivers
octeon: Move the Cavium driver
jme: Move the JME driver
xilinx/ll_temac: Move the Xilinx drivers
MAINTAINERS | 14 +-
drivers/net/Kconfig | 160 --------------------
drivers/net/Makefile | 19 ---
drivers/net/arm/Kconfig | 17 --
drivers/net/arm/Makefile | 2 -
drivers/net/ethernet/Kconfig | 33 ++++
drivers/net/ethernet/Makefile | 10 ++
drivers/net/ethernet/cirrus/Kconfig | 28 ++++
drivers/net/ethernet/cirrus/Makefile | 5 +
drivers/net/{arm => ethernet/cirrus}/ep93xx_eth.c | 0
drivers/net/{ => ethernet}/jme.c | 0
drivers/net/{ => ethernet}/jme.h | 0
drivers/net/ethernet/nuvoton/Kconfig | 29 ++++
drivers/net/ethernet/nuvoton/Makefile | 5 +
.../net/{arm => ethernet/nuvoton}/w90p910_ether.c | 0
drivers/net/{ => ethernet}/octeon/Kconfig | 6 +-
drivers/net/ethernet/octeon/Makefile | 5 +
drivers/net/{ => ethernet}/octeon/octeon_mgmt.c | 0
drivers/net/ethernet/packetengines/Kconfig | 46 ++++++
drivers/net/ethernet/packetengines/Makefile | 6 +
drivers/net/{ => ethernet/packetengines}/hamachi.c | 0
.../net/{ => ethernet/packetengines}/yellowfin.c | 0
drivers/net/{ => ethernet}/s6gmac.c | 0
drivers/net/ethernet/sis/Kconfig | 50 ++++++
drivers/net/ethernet/sis/Makefile | 6 +
drivers/net/{ => ethernet/sis}/sis190.c | 0
drivers/net/{ => ethernet/sis}/sis900.c | 0
drivers/net/{ => ethernet/sis}/sis900.h | 0
drivers/net/ethernet/ti/Kconfig | 76 +++++++++
drivers/net/ethernet/ti/Makefile | 9 +
drivers/net/{ => ethernet/ti}/cpmac.c | 0
drivers/net/{ => ethernet/ti}/davinci_cpdma.c | 0
drivers/net/{ => ethernet/ti}/davinci_cpdma.h | 0
drivers/net/{ => ethernet/ti}/davinci_emac.c | 0
drivers/net/{ => ethernet/ti}/davinci_mdio.c | 0
drivers/net/{ => ethernet/ti}/tlan.c | 0
drivers/net/{ => ethernet/ti}/tlan.h | 0
drivers/net/ethernet/tundra/Kconfig | 28 ++++
drivers/net/ethernet/tundra/Makefile | 5 +
drivers/net/{ => ethernet/tundra}/tsi108_eth.c | 0
drivers/net/{ => ethernet/tundra}/tsi108_eth.h | 0
drivers/net/ethernet/xilinx/Kconfig | 35 +++++
drivers/net/ethernet/xilinx/Makefile | 7 +
drivers/net/{ => ethernet/xilinx}/ll_temac.h | 0
drivers/net/{ => ethernet/xilinx}/ll_temac_main.c | 0
drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c | 0
.../net/{ => ethernet/xilinx}/xilinx_emaclite.c | 0
drivers/net/octeon/Makefile | 2 -
48 files changed, 395 insertions(+), 208 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%)
rename drivers/net/{ => ethernet}/jme.c (100%)
rename drivers/net/{ => ethernet}/jme.h (100%)
create mode 100644 drivers/net/ethernet/nuvoton/Kconfig
create mode 100644 drivers/net/ethernet/nuvoton/Makefile
rename drivers/net/{arm => ethernet/nuvoton}/w90p910_ether.c (100%)
rename drivers/net/{ => ethernet}/octeon/Kconfig (85%)
create mode 100644 drivers/net/ethernet/octeon/Makefile
rename drivers/net/{ => ethernet}/octeon/octeon_mgmt.c (100%)
create mode 100644 drivers/net/ethernet/packetengines/Kconfig
create mode 100644 drivers/net/ethernet/packetengines/Makefile
rename drivers/net/{ => ethernet/packetengines}/hamachi.c (100%)
rename drivers/net/{ => ethernet/packetengines}/yellowfin.c (100%)
rename drivers/net/{ => ethernet}/s6gmac.c (100%)
create mode 100644 drivers/net/ethernet/sis/Kconfig
create mode 100644 drivers/net/ethernet/sis/Makefile
rename drivers/net/{ => ethernet/sis}/sis190.c (100%)
rename drivers/net/{ => ethernet/sis}/sis900.c (100%)
rename drivers/net/{ => ethernet/sis}/sis900.h (100%)
create mode 100644 drivers/net/ethernet/ti/Kconfig
create mode 100644 drivers/net/ethernet/ti/Makefile
rename drivers/net/{ => ethernet/ti}/cpmac.c (100%)
rename drivers/net/{ => ethernet/ti}/davinci_cpdma.c (100%)
rename drivers/net/{ => ethernet/ti}/davinci_cpdma.h (100%)
rename drivers/net/{ => ethernet/ti}/davinci_emac.c (100%)
rename drivers/net/{ => ethernet/ti}/davinci_mdio.c (100%)
rename drivers/net/{ => ethernet/ti}/tlan.c (100%)
rename drivers/net/{ => ethernet/ti}/tlan.h (100%)
create mode 100644 drivers/net/ethernet/tundra/Kconfig
create mode 100644 drivers/net/ethernet/tundra/Makefile
rename drivers/net/{ => ethernet/tundra}/tsi108_eth.c (100%)
rename drivers/net/{ => ethernet/tundra}/tsi108_eth.h (100%)
create mode 100644 drivers/net/ethernet/xilinx/Kconfig
create mode 100644 drivers/net/ethernet/xilinx/Makefile
rename drivers/net/{ => ethernet/xilinx}/ll_temac.h (100%)
rename drivers/net/{ => ethernet/xilinx}/ll_temac_main.c (100%)
rename drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c (100%)
rename drivers/net/{ => ethernet/xilinx}/xilinx_emaclite.c (100%)
delete mode 100644 drivers/net/octeon/Makefile
--
1.7.6
^ permalink raw reply
* [GIT] Networking
From: David Miller @ 2011-08-12 10:33 UTC (permalink / raw)
To: torvalds; +Cc: akpm, netdev, linux-kernel
1) Alternate MAC doesn't work on some E1000E chips, from Bruce Allan.
2) bnx2x fixes from Vladislav Zolotarov and Dmitry Kravkov including a fix
for queue selection when FCOE is disabled.
3) Some uses of rt->rt_iif should be rt->rt_route_iif, from Julian
Anastasov.
4) Fix ebt_register_table() error unwind, from Julia Lawall.
5) Similarly for netlabel's netlbl_cfg_cipsov4_map_add().
6) Build fixes for SH IRDA drivers, from Kuninori Morimoto.
7) If cookie_check_timestamp() fails in some cases, we leave "ecn_ok"
uninitialized but then test it. From Mike Waychison.
8) __scm_send() accidently captures UID instead of GID in credentials,
fix from Tim Chen.
9) Fix leak in wl1251 wireless, from Julia Lawall.
10) PRIO packet scheduler needs to use qdisc_dequeue_peeked(), from Flowian
Westphal.
11) ath5k_beacon_send() needs better error handling, from Bob Copeland.
12) Add device IDs to rt2x00 USB wireless.
13) Correct source address semantics on ipv4 raw sockets, from Julian
Anastasov.
14) Packets looped back need to grab a reference to their attached route.
Also from Julian Anastasov.
15) ip_route_me_harder() fix for packets coming from the global RAW socket
TCP uses to send resets and some ACKs. From Julian Anastasov.
16) Fix compat handling for IP_PKTOPTIONS, from Daniel Baluta.
17) Add missing compat entry from PPPIOCGL2TPSTATS, from Florian Westphal.
18) Fix crash when input route accidently used for output, from Julian
Anastasov.
19) SLIP/SLCAN need to use netif_rx_ni() because of the context in which
TTY buffers are signalled. From Matvejchikov Ilya and Oliver Hartkopp.
20) Fix double-free in nf_reinject. From Julian Anastasov.
Please pull, thanks a lot!
The following changes since commit eeca7360f756f7e36e846f35018df20808c7ef63:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (2011-08-12 00:35:46 -0700)
are available in the git repository at:
master.kernel.org:/pub/scm/linux/kernel/git/davem/net.git master
Alex Hacker (1):
ath9k: fix a misprint which leads to incorrect calibration
Andrei Warkentin (1):
Bridge: Always send NETDEV_CHANGEADDR up on br MAC change.
Anthony Bourguignon (1):
rt2x00: Add rt2870 device id for Dvico usb key
Bob Copeland (1):
ath5k: fix error handling in ath5k_beacon_send
Bruce Allan (4):
e1000e: alternate MAC address does not work on device id 0x1060
e1000e: do not disable receiver on 82574/82583
e1000e: alternate MAC address update
e1000e: increase driver version number
Daniel Baluta (1):
ipv4: Fix ip_getsockopt for IP_PKTOPTIONS
David S. Miller (2):
net: Make userland include of netlink.h more sane.
Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless
Dmitry Kravkov (3):
bnx2x: prevent race between undi_unload and load flows
bnx2x: properly clean indirect addresses
bnx2x: disable dcb on 578xx since not supported yet
Florian Westphal (2):
compat_ioctl: add compat handler for PPPIOCGL2TPSTATS
net_sched: prio: use qdisc_dequeue_peeked
Hauke Mehrtens (1):
b43: read correct register on bcma bus.
Ivo van Doorn (1):
rt2x00: Add new rt73 buffalo USB id
John W. Linville (1):
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem
Julia Lawall (3):
drivers/net/wireless/wl1251: add missing kfree
net/netlabel/netlabel_kapi.c: add missing cleanup code
net/bridge/netfilter/ebtables.c: use available error handling code
Julian Anastasov (6):
netfilter: avoid double free in nf_reinject
ipv4: fix the reusing of routing cache entries
netfilter: TCP and raw fix for ip_route_me_harder
ipv4: route non-local sources for raw socket
ipv4: use dst with ref during bcast/mcast loopback
ipv4: some rt_iif -> rt_route_iif conversions
Kuninori Morimoto (3):
net/irda: sh_irda: add missing header
net/irda: sh_sir: add missing header
net/irda: sh_sir: tidyup compile warning
Larry Finger (1):
rtlwifi: rtl892cu: New USB IDs
Matvejchikov Ilya (1):
slip: fix NOHZ local_softirq_pending 08 warning
Mike Waychison (1):
tcp: initialize variable ecn_ok in syncookies path
Nicolas de Pesloüan (1):
bonding: document two undocumented options.
Oliver Hartkopp (1):
slcan: ldisc generated skbs are received in softirq context
Rajkumar Manoharan (2):
ath9k_hw: Fix incorrect Tx control power in AR9003 template
ath9k_hw: update PMU to improve ripple issue for AR9485
Ralf Baechle (1):
PCnet: Fix section mismatch
Richard Cochran (2):
gianfar: fix fiper alignment after resetting the time
dp83640: increase receive time stamp buffer size
Tim Chen (1):
scm: Capture the full credentials of the scm sender
Vladislav Zolotarov (2):
bnx2x: init FCOE FP only once
bnx2x: fix select_queue when FCoE is disabled
Willem de Bruijn (1):
net: add Documentation/networking/scaling.txt
huajun li (1):
rtl8150: rtl8150_disconnect(...) does not need tasklet_disable(...)
Documentation/networking/bonding.txt | 29 ++
Documentation/networking/scaling.txt | 371 ++++++++++++++++++++++++
drivers/net/bnx2x/bnx2x_cmn.c | 35 ++-
drivers/net/bnx2x/bnx2x_dcb.c | 2 +-
drivers/net/bnx2x/bnx2x_main.c | 23 ++-
drivers/net/bnx2x/bnx2x_reg.h | 26 ++-
drivers/net/can/slcan.c | 2 +-
drivers/net/e1000e/82571.c | 6 +-
drivers/net/e1000e/e1000.h | 1 +
drivers/net/e1000e/ethtool.c | 3 +-
drivers/net/e1000e/lib.c | 7 +-
drivers/net/e1000e/netdev.c | 9 +-
drivers/net/gianfar_ptp.c | 9 +-
drivers/net/irda/sh_irda.c | 2 +
drivers/net/irda/sh_sir.c | 4 +-
drivers/net/pcnet32.c | 2 +-
drivers/net/phy/dp83640.c | 5 +-
drivers/net/slip.c | 2 +-
drivers/net/usb/rtl8150.c | 1 -
drivers/net/wireless/ath/ath5k/base.c | 23 +-
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 8 +-
drivers/net/wireless/ath/ath9k/ar9003_phy.h | 2 +-
drivers/net/wireless/b43/dma.c | 20 +-
drivers/net/wireless/rt2x00/rt2800usb.c | 2 +
drivers/net/wireless/rt2x00/rt73usb.c | 1 +
drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 11 +-
drivers/net/wireless/wl1251/acx.c | 6 +-
drivers/net/wireless/wl1251/cmd.c | 2 +-
fs/compat_ioctl.c | 1 +
include/linux/netlink.h | 2 +-
include/linux/socket.h | 6 +-
include/net/inet_sock.h | 2 +-
net/bridge/br_if.c | 6 +-
net/bridge/br_notify.c | 7 +-
net/bridge/netfilter/ebtables.c | 3 +-
net/core/scm.c | 2 +-
net/ipv4/ip_output.c | 1 +
net/ipv4/ip_sockglue.c | 9 +-
net/ipv4/netfilter.c | 18 +-
net/ipv4/raw.c | 3 +-
net/ipv4/route.c | 9 +-
net/ipv4/syncookies.c | 2 +-
net/ipv6/syncookies.c | 2 +-
net/netfilter/nf_queue.c | 1 +
net/netlabel/netlabel_kapi.c | 20 +-
net/sched/sch_prio.c | 2 +-
46 files changed, 604 insertions(+), 106 deletions(-)
create mode 100644 Documentation/networking/scaling.txt
^ permalink raw reply
* Re: [PATCH net-next] net: cleanup some rcu_dereference_raw
From: David Miller @ 2011-08-12 10:01 UTC (permalink / raw)
To: eric.dumazet; +Cc: netdev
In-Reply-To: <1313127052.2669.6.camel@edumazet-laptop>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 12 Aug 2011 07:30:52 +0200
> RCU api had been completed and rcu_access_pointer() or
> rcu_dereference_protected() are better than generic
> rcu_dereference_raw()
>
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Applied, thanks!
^ permalink raw reply
* Re: linux-next: build warnings after merge of the net tree
From: David Miller @ 2011-08-12 10:01 UTC (permalink / raw)
To: sfr; +Cc: netdev, linux-next, linux-kernel
In-Reply-To: <20110812115319.c48966a412362f68c00c19dc@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 12 Aug 2011 11:53:19 +1000
> warning: (SCSI_BNX2_ISCSI && SCSI_BNX2X_FCOE) selects CNIC which has unmet direct dependencies (NETDEVICES && ETHERNET && NET_VENDOR_BROADCOM && PCI)
...
> warning: (SCSI_BNX2_ISCSI && SCSI_BNX2X_FCOE) selects CNIC which has unmet direct dependencies (NETDEVICES && ETHERNET && NET_VENDOR_BROADCOM && PCI)
Ok, these were the only two problem areas left after the other
fixes posted today, fixed by the following patch.
Thanks!
--------------------
>From 4c78893b3d107e2a053c8f51c526510857c09858 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Fri, 12 Aug 2011 03:00:47 -0700
Subject: [PATCH] cnic: Fix select dependencies in bnx2fc/bnx2i Kconfig.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
drivers/scsi/bnx2fc/Kconfig | 3 ++-
drivers/scsi/bnx2i/Kconfig | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/bnx2fc/Kconfig b/drivers/scsi/bnx2fc/Kconfig
index 6a38080..cfcad8b 100644
--- a/drivers/scsi/bnx2fc/Kconfig
+++ b/drivers/scsi/bnx2fc/Kconfig
@@ -2,7 +2,8 @@ config SCSI_BNX2X_FCOE
tristate "Broadcom NetXtreme II FCoE support"
depends on PCI
select NETDEVICES
- select NETDEV_1000
+ select ETHERNET
+ select NET_VENDOR_BROADCOM
select LIBFC
select LIBFCOE
select CNIC
diff --git a/drivers/scsi/bnx2i/Kconfig b/drivers/scsi/bnx2i/Kconfig
index 45a6154..01cff18 100644
--- a/drivers/scsi/bnx2i/Kconfig
+++ b/drivers/scsi/bnx2i/Kconfig
@@ -4,7 +4,8 @@ config SCSI_BNX2_ISCSI
depends on PCI
select SCSI_ISCSI_ATTRS
select NETDEVICES
- select NETDEV_1000
+ select ETHERNET
+ select NET_VENDOR_BROADCOM
select CNIC
---help---
This driver supports iSCSI offload for the Broadcom NetXtreme II
--
1.7.6
^ permalink raw reply related
* Re: [PATCH v2 net-next] neigh: reduce arp latency
From: David Miller @ 2011-08-12 9:57 UTC (permalink / raw)
To: eric.dumazet; +Cc: ja, netdev
In-Reply-To: <1312913758.2547.8.camel@edumazet-laptop>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 09 Aug 2011 20:15:58 +0200
> Le mardi 09 août 2011 à 20:06 +0300, Julian Anastasov a écrit :
>
>> To be correct with old NUD_INCOMPLETE logic may be we can use
>> max(neigh->parms->retrans_time, HZ/2) here instead of HZ?
>>
>
> Thanks Julian a lot for reviewing, here is v2 adressing this point.
>
> [PATCH v2 net-next] neigh: reduce arp latency
>
> Remove the artificial HZ latency on arp resolution.
>
> Instead of firing a timer in one jiffy (up to 10 ms if HZ=100), lets
> send the ARP message immediately.
>
> Before patch :
>
> # arp -d 192.168.20.108 ; ping -c 3 192.168.20.108
> PING 192.168.20.108 (192.168.20.108) 56(84) bytes of data.
> 64 bytes from 192.168.20.108: icmp_seq=1 ttl=64 time=9.91 ms
> 64 bytes from 192.168.20.108: icmp_seq=2 ttl=64 time=0.065 ms
> 64 bytes from 192.168.20.108: icmp_seq=3 ttl=64 time=0.061 ms
>
> After patch :
>
> $ arp -d 192.168.20.108 ; ping -c 3 192.168.20.108
> PING 192.168.20.108 (192.168.20.108) 56(84) bytes of data.
> 64 bytes from 192.168.20.108: icmp_seq=1 ttl=64 time=0.152 ms
> 64 bytes from 192.168.20.108: icmp_seq=2 ttl=64 time=0.064 ms
> 64 bytes from 192.168.20.108: icmp_seq=3 ttl=64 time=0.074 ms
>
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Applied.
^ permalink raw reply
* Re: [PATCH net-next 0/6] be2net: fixes
From: David Miller @ 2011-08-12 9:56 UTC (permalink / raw)
To: eric.dumazet; +Cc: sathya.perla, netdev
In-Reply-To: <1312906987.2371.51.camel@edumazet-HP-Compaq-6005-Pro-SFF-PC>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 09 Aug 2011 18:23:07 +0200
> [PATCH] 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>
Applied.
^ permalink raw reply
* Re: [net-next RFC PATCH 7/7] virtio-net changes
From: Sasha Levin @ 2011-08-12 9:09 UTC (permalink / raw)
To: Jason Wang
Cc: krkumar2, kvm, mst, qemu-devel, netdev, rusty, linux-kernel,
virtualization, mirq-linux, davem
In-Reply-To: <20110812015551.31613.13885.stgit@intel-e5620-16-2.englab.nay.redhat.com>
On Fri, 2011-08-12 at 09:55 +0800, Jason Wang wrote:
> From: Krishna Kumar <krkumar2@in.ibm.com>
>
> Implement mq virtio-net driver.
>
> Though struct virtio_net_config changes, it works with the old
> qemu since the last element is not accessed unless qemu sets
> VIRTIO_NET_F_MULTIQUEUE.
>
> Signed-off-by: Krishna Kumar <krkumar2@in.ibm.com>
> Signed-off-by: Jason Wang <jasowang@redhat.com>
> ---
Could these changes be documented to virtio-spec as well?
> drivers/net/virtio_net.c | 578 +++++++++++++++++++++++++++++++-------------
> include/linux/virtio_net.h | 3
> 2 files changed, 411 insertions(+), 170 deletions(-)
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index 0c7321c..03a199d 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -49,16 +49,48 @@ struct virtnet_stats {
> u64 rx_packets;
> };
>
> -struct virtnet_info {
> - struct virtio_device *vdev;
> - struct virtqueue *rvq, *svq, *cvq;
> - struct net_device *dev;
> +/* Internal representation of a send virtqueue */
> +struct send_queue {
> + /* Virtqueue associated with this send _queue */
> + struct virtqueue *svq;
> +
> + /* TX: fragments + linear part + virtio header */
> + struct scatterlist tx_sg[MAX_SKB_FRAGS + 2];
> +};
> +
> +/* Internal representation of a receive virtqueue */
> +struct receive_queue {
> + /* Virtqueue associated with this receive_queue */
> + struct virtqueue *rvq;
> +
> + /* Back pointer to the virtnet_info */
> + struct virtnet_info *vi;
> +
> struct napi_struct napi;
> - unsigned int status;
>
> /* Number of input buffers, and max we've ever had. */
> unsigned int num, max;
>
> + /* Work struct for refilling if we run low on memory. */
> + struct delayed_work refill;
> +
> + /* Chain pages by the private ptr. */
> + struct page *pages;
> +
> + /* RX: fragments + linear part + virtio header */
> + struct scatterlist rx_sg[MAX_SKB_FRAGS + 2];
> +};
> +
> +struct virtnet_info {
> + struct send_queue **sq;
> + struct receive_queue **rq;
> +
> + int numtxqs; /* # of rxqs/txqs */
> + struct virtio_device *vdev;
> + struct virtqueue *cvq;
> + struct net_device *dev;
> + unsigned int status;
> +
> /* I like... big packets and I cannot lie! */
> bool big_packets;
>
> @@ -67,16 +99,6 @@ struct virtnet_info {
>
> /* Active statistics */
> struct virtnet_stats __percpu *stats;
> -
> - /* Work struct for refilling if we run low on memory. */
> - struct delayed_work refill;
> -
> - /* Chain pages by the private ptr. */
> - struct page *pages;
> -
> - /* fragments + linear part + virtio header */
> - struct scatterlist rx_sg[MAX_SKB_FRAGS + 2];
> - struct scatterlist tx_sg[MAX_SKB_FRAGS + 2];
> };
>
> struct skb_vnet_hdr {
> @@ -106,22 +128,22 @@ static inline struct skb_vnet_hdr *skb_vnet_hdr(struct sk_buff *skb)
> * private is used to chain pages for big packets, put the whole
> * most recent used list in the beginning for reuse
> */
> -static void give_pages(struct virtnet_info *vi, struct page *page)
> +static void give_pages(struct receive_queue *rq, struct page *page)
> {
> struct page *end;
>
> /* Find end of list, sew whole thing into vi->pages. */
> for (end = page; end->private; end = (struct page *)end->private);
> - end->private = (unsigned long)vi->pages;
> - vi->pages = page;
> + end->private = (unsigned long)rq->pages;
> + rq->pages = page;
> }
>
> -static struct page *get_a_page(struct virtnet_info *vi, gfp_t gfp_mask)
> +static struct page *get_a_page(struct receive_queue *rq, gfp_t gfp_mask)
> {
> - struct page *p = vi->pages;
> + struct page *p = rq->pages;
>
> if (p) {
> - vi->pages = (struct page *)p->private;
> + rq->pages = (struct page *)p->private;
> /* clear private here, it is used to chain pages */
> p->private = 0;
> } else
> @@ -132,12 +154,13 @@ static struct page *get_a_page(struct virtnet_info *vi, gfp_t gfp_mask)
> static void skb_xmit_done(struct virtqueue *svq)
> {
> struct virtnet_info *vi = svq->vdev->priv;
> + int qnum = svq->queue_index / 2; /* RX/TX vqs are allocated in pairs */
>
> /* Suppress further interrupts. */
> virtqueue_disable_cb(svq);
>
> /* We were probably waiting for more output buffers. */
> - netif_wake_queue(vi->dev);
> + netif_wake_subqueue(vi->dev, qnum);
> }
>
> static void set_skb_frag(struct sk_buff *skb, struct page *page,
> @@ -157,9 +180,10 @@ static void set_skb_frag(struct sk_buff *skb, struct page *page,
> *len -= f->size;
> }
>
> -static struct sk_buff *page_to_skb(struct virtnet_info *vi,
> +static struct sk_buff *page_to_skb(struct receive_queue *rq,
> struct page *page, unsigned int len)
> {
> + struct virtnet_info *vi = rq->vi;
> struct sk_buff *skb;
> struct skb_vnet_hdr *hdr;
> unsigned int copy, hdr_len, offset;
> @@ -202,12 +226,12 @@ static struct sk_buff *page_to_skb(struct virtnet_info *vi,
> }
>
> if (page)
> - give_pages(vi, page);
> + give_pages(rq, page);
>
> return skb;
> }
>
> -static int receive_mergeable(struct virtnet_info *vi, struct sk_buff *skb)
> +static int receive_mergeable(struct receive_queue *rq, struct sk_buff *skb)
> {
> struct skb_vnet_hdr *hdr = skb_vnet_hdr(skb);
> struct page *page;
> @@ -221,7 +245,8 @@ static int receive_mergeable(struct virtnet_info *vi, struct sk_buff *skb)
> skb->dev->stats.rx_length_errors++;
> return -EINVAL;
> }
> - page = virtqueue_get_buf(vi->rvq, &len);
> +
> + page = virtqueue_get_buf(rq->rvq, &len);
> if (!page) {
> pr_debug("%s: rx error: %d buffers missing\n",
> skb->dev->name, hdr->mhdr.num_buffers);
> @@ -234,13 +259,14 @@ static int receive_mergeable(struct virtnet_info *vi, struct sk_buff *skb)
>
> set_skb_frag(skb, page, 0, &len);
>
> - --vi->num;
> + --rq->num;
> }
> return 0;
> }
>
> -static void receive_buf(struct net_device *dev, void *buf, unsigned int len)
> +static void receive_buf(struct receive_queue *rq, void *buf, unsigned int len)
> {
> + struct net_device *dev = rq->vi->dev;
> struct virtnet_info *vi = netdev_priv(dev);
> struct virtnet_stats __percpu *stats = this_cpu_ptr(vi->stats);
> struct sk_buff *skb;
> @@ -251,7 +277,7 @@ static void receive_buf(struct net_device *dev, void *buf, unsigned int len)
> pr_debug("%s: short packet %i\n", dev->name, len);
> dev->stats.rx_length_errors++;
> if (vi->mergeable_rx_bufs || vi->big_packets)
> - give_pages(vi, buf);
> + give_pages(rq, buf);
> else
> dev_kfree_skb(buf);
> return;
> @@ -263,14 +289,14 @@ static void receive_buf(struct net_device *dev, void *buf, unsigned int len)
> skb_trim(skb, len);
> } else {
> page = buf;
> - skb = page_to_skb(vi, page, len);
> + skb = page_to_skb(rq, page, len);
> if (unlikely(!skb)) {
> dev->stats.rx_dropped++;
> - give_pages(vi, page);
> + give_pages(rq, page);
> return;
> }
> if (vi->mergeable_rx_bufs)
> - if (receive_mergeable(vi, skb)) {
> + if (receive_mergeable(rq, skb)) {
> dev_kfree_skb(skb);
> return;
> }
> @@ -341,184 +367,200 @@ frame_err:
> dev_kfree_skb(skb);
> }
>
> -static int add_recvbuf_small(struct virtnet_info *vi, gfp_t gfp)
> +static int add_recvbuf_small(struct receive_queue *rq, gfp_t gfp)
> {
> struct sk_buff *skb;
> struct skb_vnet_hdr *hdr;
> int err;
>
> - skb = netdev_alloc_skb_ip_align(vi->dev, MAX_PACKET_LEN);
> + skb = netdev_alloc_skb_ip_align(rq->vi->dev, MAX_PACKET_LEN);
> if (unlikely(!skb))
> return -ENOMEM;
>
> skb_put(skb, MAX_PACKET_LEN);
>
> hdr = skb_vnet_hdr(skb);
> - sg_set_buf(vi->rx_sg, &hdr->hdr, sizeof hdr->hdr);
> + sg_set_buf(rq->rx_sg, &hdr->hdr, sizeof hdr->hdr);
>
> - skb_to_sgvec(skb, vi->rx_sg + 1, 0, skb->len);
> + skb_to_sgvec(skb, rq->rx_sg + 1, 0, skb->len);
>
> - err = virtqueue_add_buf_gfp(vi->rvq, vi->rx_sg, 0, 2, skb, gfp);
> + err = virtqueue_add_buf_gfp(rq->rvq, rq->rx_sg, 0, 2, skb, gfp);
> if (err < 0)
> dev_kfree_skb(skb);
>
> return err;
> }
>
> -static int add_recvbuf_big(struct virtnet_info *vi, gfp_t gfp)
> +static int add_recvbuf_big(struct receive_queue *rq, gfp_t gfp)
> {
> struct page *first, *list = NULL;
> char *p;
> int i, err, offset;
>
> - /* page in vi->rx_sg[MAX_SKB_FRAGS + 1] is list tail */
> + /* page in rq->rx_sg[MAX_SKB_FRAGS + 1] is list tail */
> for (i = MAX_SKB_FRAGS + 1; i > 1; --i) {
> - first = get_a_page(vi, gfp);
> + first = get_a_page(rq, gfp);
> if (!first) {
> if (list)
> - give_pages(vi, list);
> + give_pages(rq, list);
> return -ENOMEM;
> }
> - sg_set_buf(&vi->rx_sg[i], page_address(first), PAGE_SIZE);
> + sg_set_buf(&rq->rx_sg[i], page_address(first), PAGE_SIZE);
>
> /* chain new page in list head to match sg */
> first->private = (unsigned long)list;
> list = first;
> }
>
> - first = get_a_page(vi, gfp);
> + first = get_a_page(rq, gfp);
> if (!first) {
> - give_pages(vi, list);
> + give_pages(rq, list);
> return -ENOMEM;
> }
> p = page_address(first);
>
> - /* vi->rx_sg[0], vi->rx_sg[1] share the same page */
> - /* a separated vi->rx_sg[0] for virtio_net_hdr only due to QEMU bug */
> - sg_set_buf(&vi->rx_sg[0], p, sizeof(struct virtio_net_hdr));
> + /* rq->rx_sg[0], rq->rx_sg[1] share the same page */
> + /* a separated rq->rx_sg[0] for virtio_net_hdr only due to QEMU bug */
> + sg_set_buf(&rq->rx_sg[0], p, sizeof(struct virtio_net_hdr));
>
> - /* vi->rx_sg[1] for data packet, from offset */
> + /* rq->rx_sg[1] for data packet, from offset */
> offset = sizeof(struct padded_vnet_hdr);
> - sg_set_buf(&vi->rx_sg[1], p + offset, PAGE_SIZE - offset);
> + sg_set_buf(&rq->rx_sg[1], p + offset, PAGE_SIZE - offset);
>
> /* chain first in list head */
> first->private = (unsigned long)list;
> - err = virtqueue_add_buf_gfp(vi->rvq, vi->rx_sg, 0, MAX_SKB_FRAGS + 2,
> + err = virtqueue_add_buf_gfp(rq->rvq, rq->rx_sg, 0, MAX_SKB_FRAGS + 2,
> first, gfp);
> if (err < 0)
> - give_pages(vi, first);
> + give_pages(rq, first);
>
> return err;
> }
>
> -static int add_recvbuf_mergeable(struct virtnet_info *vi, gfp_t gfp)
> +static int add_recvbuf_mergeable(struct receive_queue *rq, gfp_t gfp)
> {
> struct page *page;
> int err;
>
> - page = get_a_page(vi, gfp);
> + page = get_a_page(rq, gfp);
> if (!page)
> return -ENOMEM;
>
> - sg_init_one(vi->rx_sg, page_address(page), PAGE_SIZE);
> + sg_init_one(rq->rx_sg, page_address(page), PAGE_SIZE);
>
> - err = virtqueue_add_buf_gfp(vi->rvq, vi->rx_sg, 0, 1, page, gfp);
> + err = virtqueue_add_buf_gfp(rq->rvq, rq->rx_sg, 0, 1, page, gfp);
> if (err < 0)
> - give_pages(vi, page);
> + give_pages(rq, page);
>
> return err;
> }
>
> /* Returns false if we couldn't fill entirely (OOM). */
> -static bool try_fill_recv(struct virtnet_info *vi, gfp_t gfp)
> +static bool try_fill_recv(struct receive_queue *rq, gfp_t gfp)
> {
> + struct virtnet_info *vi = rq->vi;
> int err;
> bool oom;
>
> do {
> if (vi->mergeable_rx_bufs)
> - err = add_recvbuf_mergeable(vi, gfp);
> + err = add_recvbuf_mergeable(rq, gfp);
> else if (vi->big_packets)
> - err = add_recvbuf_big(vi, gfp);
> + err = add_recvbuf_big(rq, gfp);
> else
> - err = add_recvbuf_small(vi, gfp);
> + err = add_recvbuf_small(rq, gfp);
>
> oom = err == -ENOMEM;
> if (err < 0)
> break;
> - ++vi->num;
> + ++rq->num;
> } while (err > 0);
> - if (unlikely(vi->num > vi->max))
> - vi->max = vi->num;
> - virtqueue_kick(vi->rvq);
> + if (unlikely(rq->num > rq->max))
> + rq->max = rq->num;
> + virtqueue_kick(rq->rvq);
> return !oom;
> }
>
> static void skb_recv_done(struct virtqueue *rvq)
> {
> + int qnum = rvq->queue_index / 2; /* RX/TX vqs are allocated in pairs */
> struct virtnet_info *vi = rvq->vdev->priv;
> + struct napi_struct *napi = &vi->rq[qnum]->napi;
> +
> /* Schedule NAPI, Suppress further interrupts if successful. */
> - if (napi_schedule_prep(&vi->napi)) {
> + if (napi_schedule_prep(napi)) {
> virtqueue_disable_cb(rvq);
> - __napi_schedule(&vi->napi);
> + __napi_schedule(napi);
> }
> }
>
> -static void virtnet_napi_enable(struct virtnet_info *vi)
> +static void virtnet_napi_enable(struct receive_queue *rq)
> {
> - napi_enable(&vi->napi);
> + napi_enable(&rq->napi);
>
> /* If all buffers were filled by other side before we napi_enabled, we
> * won't get another interrupt, so process any outstanding packets
> * now. virtnet_poll wants re-enable the queue, so we disable here.
> * We synchronize against interrupts via NAPI_STATE_SCHED */
> - if (napi_schedule_prep(&vi->napi)) {
> - virtqueue_disable_cb(vi->rvq);
> - __napi_schedule(&vi->napi);
> + if (napi_schedule_prep(&rq->napi)) {
> + virtqueue_disable_cb(rq->rvq);
> + __napi_schedule(&rq->napi);
> }
> }
>
> +static void virtnet_napi_enable_all_queues(struct virtnet_info *vi)
> +{
> + int i;
> +
> + for (i = 0; i < vi->numtxqs; i++)
> + virtnet_napi_enable(vi->rq[i]);
> +}
> +
> static void refill_work(struct work_struct *work)
> {
> - struct virtnet_info *vi;
> + struct napi_struct *napi;
> + struct receive_queue *rq;
> bool still_empty;
>
> - vi = container_of(work, struct virtnet_info, refill.work);
> - napi_disable(&vi->napi);
> - still_empty = !try_fill_recv(vi, GFP_KERNEL);
> - virtnet_napi_enable(vi);
> + rq = container_of(work, struct receive_queue, refill.work);
> + napi = &rq->napi;
> +
> + napi_disable(napi);
> + still_empty = !try_fill_recv(rq, GFP_KERNEL);
> + virtnet_napi_enable(rq);
>
> /* In theory, this can happen: if we don't get any buffers in
> * we will *never* try to fill again. */
> if (still_empty)
> - schedule_delayed_work(&vi->refill, HZ/2);
> + schedule_delayed_work(&rq->refill, HZ/2);
> }
>
> static int virtnet_poll(struct napi_struct *napi, int budget)
> {
> - struct virtnet_info *vi = container_of(napi, struct virtnet_info, napi);
> + struct receive_queue *rq = container_of(napi, struct receive_queue,
> + napi);
> void *buf;
> unsigned int len, received = 0;
>
> again:
> while (received < budget &&
> - (buf = virtqueue_get_buf(vi->rvq, &len)) != NULL) {
> - receive_buf(vi->dev, buf, len);
> - --vi->num;
> + (buf = virtqueue_get_buf(rq->rvq, &len)) != NULL) {
> + receive_buf(rq, buf, len);
> + --rq->num;
> received++;
> }
>
> - if (vi->num < vi->max / 2) {
> - if (!try_fill_recv(vi, GFP_ATOMIC))
> - schedule_delayed_work(&vi->refill, 0);
> + if (rq->num < rq->max / 2) {
> + if (!try_fill_recv(rq, GFP_ATOMIC))
> + schedule_delayed_work(&rq->refill, 0);
> }
>
> /* Out of packets? */
> if (received < budget) {
> napi_complete(napi);
> - if (unlikely(!virtqueue_enable_cb(vi->rvq)) &&
> + if (unlikely(!virtqueue_enable_cb(rq->rvq)) &&
> napi_schedule_prep(napi)) {
> - virtqueue_disable_cb(vi->rvq);
> + virtqueue_disable_cb(rq->rvq);
> __napi_schedule(napi);
> goto again;
> }
> @@ -527,13 +569,14 @@ again:
> return received;
> }
>
> -static unsigned int free_old_xmit_skbs(struct virtnet_info *vi)
> +static unsigned int free_old_xmit_skbs(struct virtnet_info *vi,
> + struct virtqueue *svq)
> {
> struct sk_buff *skb;
> unsigned int len, tot_sgs = 0;
> struct virtnet_stats __percpu *stats = this_cpu_ptr(vi->stats);
>
> - while ((skb = virtqueue_get_buf(vi->svq, &len)) != NULL) {
> + while ((skb = virtqueue_get_buf(svq, &len)) != NULL) {
> pr_debug("Sent skb %p\n", skb);
>
> u64_stats_update_begin(&stats->syncp);
> @@ -547,7 +590,8 @@ static unsigned int free_old_xmit_skbs(struct virtnet_info *vi)
> return tot_sgs;
> }
>
> -static int xmit_skb(struct virtnet_info *vi, struct sk_buff *skb)
> +static int xmit_skb(struct virtnet_info *vi, struct sk_buff *skb,
> + struct virtqueue *svq, struct scatterlist *tx_sg)
> {
> struct skb_vnet_hdr *hdr = skb_vnet_hdr(skb);
> const unsigned char *dest = ((struct ethhdr *)skb->data)->h_dest;
> @@ -585,12 +629,12 @@ static int xmit_skb(struct virtnet_info *vi, struct sk_buff *skb)
>
> /* Encode metadata header at front. */
> if (vi->mergeable_rx_bufs)
> - sg_set_buf(vi->tx_sg, &hdr->mhdr, sizeof hdr->mhdr);
> + sg_set_buf(tx_sg, &hdr->mhdr, sizeof hdr->mhdr);
> else
> - sg_set_buf(vi->tx_sg, &hdr->hdr, sizeof hdr->hdr);
> + sg_set_buf(tx_sg, &hdr->hdr, sizeof hdr->hdr);
>
> - hdr->num_sg = skb_to_sgvec(skb, vi->tx_sg + 1, 0, skb->len) + 1;
> - return virtqueue_add_buf(vi->svq, vi->tx_sg, hdr->num_sg,
> + hdr->num_sg = skb_to_sgvec(skb, tx_sg + 1, 0, skb->len) + 1;
> + return virtqueue_add_buf(svq, tx_sg, hdr->num_sg,
> 0, skb);
> }
>
> @@ -598,31 +642,34 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)
> {
> struct virtnet_info *vi = netdev_priv(dev);
> int capacity;
> + int qnum = skb_get_queue_mapping(skb);
> + struct virtqueue *svq = vi->sq[qnum]->svq;
>
> /* Free up any pending old buffers before queueing new ones. */
> - free_old_xmit_skbs(vi);
> + free_old_xmit_skbs(vi, svq);
>
> /* Try to transmit */
> - capacity = xmit_skb(vi, skb);
> + capacity = xmit_skb(vi, skb, svq, vi->sq[qnum]->tx_sg);
>
> /* This can happen with OOM and indirect buffers. */
> if (unlikely(capacity < 0)) {
> if (net_ratelimit()) {
> if (likely(capacity == -ENOMEM)) {
> dev_warn(&dev->dev,
> - "TX queue failure: out of memory\n");
> + "TXQ (%d) failure: out of memory\n",
> + qnum);
> } else {
> dev->stats.tx_fifo_errors++;
> dev_warn(&dev->dev,
> - "Unexpected TX queue failure: %d\n",
> - capacity);
> + "Unexpected TXQ (%d) failure: %d\n",
> + qnum, capacity);
> }
> }
> dev->stats.tx_dropped++;
> kfree_skb(skb);
> return NETDEV_TX_OK;
> }
> - virtqueue_kick(vi->svq);
> + virtqueue_kick(svq);
>
> /* Don't wait up for transmitted skbs to be freed. */
> skb_orphan(skb);
> @@ -631,13 +678,13 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)
> /* Apparently nice girls don't return TX_BUSY; stop the queue
> * before it gets out of hand. Naturally, this wastes entries. */
> if (capacity < 2+MAX_SKB_FRAGS) {
> - netif_stop_queue(dev);
> - if (unlikely(!virtqueue_enable_cb_delayed(vi->svq))) {
> + netif_stop_subqueue(dev, qnum);
> + if (unlikely(!virtqueue_enable_cb_delayed(svq))) {
> /* More just got used, free them then recheck. */
> - capacity += free_old_xmit_skbs(vi);
> + capacity += free_old_xmit_skbs(vi, svq);
> if (capacity >= 2+MAX_SKB_FRAGS) {
> - netif_start_queue(dev);
> - virtqueue_disable_cb(vi->svq);
> + netif_start_subqueue(dev, qnum);
> + virtqueue_disable_cb(svq);
> }
> }
> }
> @@ -700,8 +747,10 @@ static struct rtnl_link_stats64 *virtnet_stats(struct net_device *dev,
> static void virtnet_netpoll(struct net_device *dev)
> {
> struct virtnet_info *vi = netdev_priv(dev);
> + int i;
>
> - napi_schedule(&vi->napi);
> + for (i = 0; i < vi->numtxqs; i++)
> + napi_schedule(&vi->rq[i]->napi);
> }
> #endif
>
> @@ -709,7 +758,7 @@ static int virtnet_open(struct net_device *dev)
> {
> struct virtnet_info *vi = netdev_priv(dev);
>
> - virtnet_napi_enable(vi);
> + virtnet_napi_enable_all_queues(vi);
> return 0;
> }
>
> @@ -761,8 +810,10 @@ static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd,
> static int virtnet_close(struct net_device *dev)
> {
> struct virtnet_info *vi = netdev_priv(dev);
> + int i;
>
> - napi_disable(&vi->napi);
> + for (i = 0; i < vi->numtxqs; i++)
> + napi_disable(&vi->rq[i]->napi);
>
> return 0;
> }
> @@ -919,10 +970,10 @@ static void virtnet_update_status(struct virtnet_info *vi)
>
> if (vi->status & VIRTIO_NET_S_LINK_UP) {
> netif_carrier_on(vi->dev);
> - netif_wake_queue(vi->dev);
> + netif_tx_wake_all_queues(vi->dev);
> } else {
> netif_carrier_off(vi->dev);
> - netif_stop_queue(vi->dev);
> + netif_tx_stop_all_queues(vi->dev);
> }
> }
>
> @@ -933,18 +984,222 @@ static void virtnet_config_changed(struct virtio_device *vdev)
> virtnet_update_status(vi);
> }
>
> +static void free_receive_bufs(struct virtnet_info *vi)
> +{
> + int i;
> +
> + for (i = 0; i < vi->numtxqs; i++) {
> + BUG_ON(vi->rq[i] == NULL);
> + while (vi->rq[i]->pages)
> + __free_pages(get_a_page(vi->rq[i], GFP_KERNEL), 0);
> + }
> +}
> +
> +/* Free memory allocated for send and receive queues */
> +static void free_rq_sq(struct virtnet_info *vi)
> +{
> + int i;
> +
> + if (vi->rq) {
> + for (i = 0; i < vi->numtxqs; i++)
> + kfree(vi->rq[i]);
> + kfree(vi->rq);
> + }
> +
> + if (vi->sq) {
> + for (i = 0; i < vi->numtxqs; i++)
> + kfree(vi->sq[i]);
> + kfree(vi->sq);
> + }
> +}
> +
> +static void free_unused_bufs(struct virtnet_info *vi)
> +{
> + void *buf;
> + int i;
> +
> + for (i = 0; i < vi->numtxqs; i++) {
> + struct virtqueue *svq = vi->sq[i]->svq;
> +
> + while (1) {
> + buf = virtqueue_detach_unused_buf(svq);
> + if (!buf)
> + break;
> + dev_kfree_skb(buf);
> + }
> + }
> +
> + for (i = 0; i < vi->numtxqs; i++) {
> + struct virtqueue *rvq = vi->rq[i]->rvq;
> +
> + while (1) {
> + buf = virtqueue_detach_unused_buf(rvq);
> + if (!buf)
> + break;
> + if (vi->mergeable_rx_bufs || vi->big_packets)
> + give_pages(vi->rq[i], buf);
> + else
> + dev_kfree_skb(buf);
> + --vi->rq[i]->num;
> + }
> + BUG_ON(vi->rq[i]->num != 0);
> + }
> +}
> +
> +#define MAX_DEVICE_NAME 16
> +static int initialize_vqs(struct virtnet_info *vi, int numtxqs)
> +{
> + vq_callback_t **callbacks;
> + struct virtqueue **vqs;
> + int i, err = -ENOMEM;
> + int totalvqs;
> + char **names;
> +
> + /* Allocate receive queues */
> + vi->rq = kcalloc(numtxqs, sizeof(*vi->rq), GFP_KERNEL);
> + if (!vi->rq)
> + goto out;
> + for (i = 0; i < numtxqs; i++) {
> + vi->rq[i] = kzalloc(sizeof(*vi->rq[i]), GFP_KERNEL);
> + if (!vi->rq[i])
> + goto out;
> + }
> +
> + /* Allocate send queues */
> + vi->sq = kcalloc(numtxqs, sizeof(*vi->sq), GFP_KERNEL);
> + if (!vi->sq)
> + goto out;
> + for (i = 0; i < numtxqs; i++) {
> + vi->sq[i] = kzalloc(sizeof(*vi->sq[i]), GFP_KERNEL);
> + if (!vi->sq[i])
> + goto out;
> + }
> +
> + /* setup initial receive and send queue parameters */
> + for (i = 0; i < numtxqs; i++) {
> + vi->rq[i]->vi = vi;
> + vi->rq[i]->pages = NULL;
> + INIT_DELAYED_WORK(&vi->rq[i]->refill, refill_work);
> + netif_napi_add(vi->dev, &vi->rq[i]->napi, virtnet_poll,
> + napi_weight);
> +
> + sg_init_table(vi->rq[i]->rx_sg, ARRAY_SIZE(vi->rq[i]->rx_sg));
> + sg_init_table(vi->sq[i]->tx_sg, ARRAY_SIZE(vi->sq[i]->tx_sg));
> + }
> +
> + /*
> + * We expect 1 RX virtqueue followed by 1 TX virtqueues, followed
> + * by the same 'numtxqs-1' times, and optionally one control virtqueue.
> + */
> + totalvqs = numtxqs * 2 +
> + virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ);
> +
> + /* Allocate space for find_vqs parameters */
> + vqs = kmalloc(totalvqs * sizeof(*vqs), GFP_KERNEL);
> + callbacks = kmalloc(totalvqs * sizeof(*callbacks), GFP_KERNEL);
> + names = kzalloc(totalvqs * sizeof(*names), GFP_KERNEL);
> + if (!vqs || !callbacks || !names)
> + goto free_params;
> +
> +#if 1
> + /* Allocate/initialize parameters for recv/send virtqueues */
> + for (i = 0; i < numtxqs * 2; i++) {
> + names[i] = kmalloc(MAX_DEVICE_NAME * sizeof(*names[i]),
> + GFP_KERNEL);
> + if (!names[i])
> + goto free_params;
> +
> + if (!(i & 1)) { /* RX */
> + callbacks[i] = skb_recv_done;
> + sprintf(names[i], "input.%d", i / 2);
> + } else {
> + callbacks[i] = skb_xmit_done;
> + sprintf(names[i], "output.%d", i / 2);
> + }
> + }
> +
> + /* Parameters for control virtqueue, if any */
> + if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ)) {
> + callbacks[i] = NULL;
> + names[i] = "control";
> + }
> +#else
> + /* Allocate/initialize parameters for recv virtqueues */
> + for (i = 0; i < numtxqs * 2; i += 2) {
> + callbacks[i] = skb_recv_done;
> + names[i] = kmalloc(MAX_DEVICE_NAME * sizeof(*names[i]),
> + GFP_KERNEL);
> + if (!names[i])
> + goto free_params;
> + sprintf(names[i], "input.%d", i / 2);
> + }
> +
> + /* Allocate/initialize parameters for send virtqueues */
> + for (i = 1; i < numtxqs * 2; i += 2) {
> + callbacks[i] = skb_xmit_done;
> + names[i] = kmalloc(MAX_DEVICE_NAME * sizeof(*names[i]),
> + GFP_KERNEL);
> + if (!names[i])
> + goto free_params;
> + sprintf(names[i], "output.%d", i / 2);
> + }
> +
> + /* Parameters for control virtqueue, if any */
> + if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ)) {
> + callbacks[i - 1] = NULL;
> + names[i - 1] = "control";
> + }
> +#endif
> +
> + err = vi->vdev->config->find_vqs(vi->vdev, totalvqs, vqs, callbacks,
> + (const char **)names);
> + if (err)
> + goto free_params;
> +
> + /* Assign the allocated vqs alternatively for RX/TX */
> + for (i = 0; i < numtxqs * 2; i += 2) {
> + vi->rq[i/2]->rvq = vqs[i];
> + vi->sq[i/2]->svq = vqs[i + 1];
> + }
> +
> + if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ))
> + vi->cvq = vqs[i];
> +
> +free_params:
> + if (names) {
> + for (i = 0; i < numtxqs * 2; i++)
> + kfree(names[i]);
> + kfree(names);
> + }
> +
> + kfree(callbacks);
> + kfree(vqs);
> +
> +out:
> + if (err)
> + free_rq_sq(vi);
> +
> + return err;
> +}
> +
> static int virtnet_probe(struct virtio_device *vdev)
> {
> - int err;
> + int i, err;
> + u16 numtxqs;
> + u16 num_queue_pairs = 2;
> struct net_device *dev;
> struct virtnet_info *vi;
> - struct virtqueue *vqs[3];
> - vq_callback_t *callbacks[] = { skb_recv_done, skb_xmit_done, NULL};
> - const char *names[] = { "input", "output", "control" };
> - int nvqs;
> +
> + /* Find if host supports MULTIQUEUE */
> + err = virtio_config_val(vdev, VIRTIO_NET_F_MULTIQUEUE,
> + offsetof(struct virtio_net_config,
> + num_queue_pairs), &num_queue_pairs);
> + numtxqs = num_queue_pairs / 2;
> + if (!numtxqs)
> + numtxqs = 1;
>
> /* Allocate ourselves a network device with room for our info */
> - dev = alloc_etherdev(sizeof(struct virtnet_info));
> + dev = alloc_etherdev_mq(sizeof(struct virtnet_info), numtxqs);
> if (!dev)
> return -ENOMEM;
>
> @@ -991,19 +1246,14 @@ static int virtnet_probe(struct virtio_device *vdev)
>
> /* Set up our device-specific information */
> vi = netdev_priv(dev);
> - netif_napi_add(dev, &vi->napi, virtnet_poll, napi_weight);
> vi->dev = dev;
> vi->vdev = vdev;
> vdev->priv = vi;
> - vi->pages = NULL;
> vi->stats = alloc_percpu(struct virtnet_stats);
> err = -ENOMEM;
> if (vi->stats == NULL)
> goto free;
> -
> - INIT_DELAYED_WORK(&vi->refill, refill_work);
> - sg_init_table(vi->rx_sg, ARRAY_SIZE(vi->rx_sg));
> - sg_init_table(vi->tx_sg, ARRAY_SIZE(vi->tx_sg));
> + vi->numtxqs = numtxqs;
>
> /* If we can receive ANY GSO packets, we must allocate large ones. */
> if (virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO4) ||
> @@ -1014,23 +1264,14 @@ static int virtnet_probe(struct virtio_device *vdev)
> if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF))
> vi->mergeable_rx_bufs = true;
>
> - /* We expect two virtqueues, receive then send,
> - * and optionally control. */
> - nvqs = virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ) ? 3 : 2;
> -
> - err = vdev->config->find_vqs(vdev, nvqs, vqs, callbacks, names);
> + /* Initialize our rx/tx queue parameters, and invoke find_vqs */
> + err = initialize_vqs(vi, numtxqs);
> if (err)
> goto free_stats;
>
> - vi->rvq = vqs[0];
> - vi->svq = vqs[1];
> -
> - if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ)) {
> - vi->cvq = vqs[2];
> -
> - if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VLAN))
> - dev->features |= NETIF_F_HW_VLAN_FILTER;
> - }
> + if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ) &&
> + virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VLAN))
> + dev->features |= NETIF_F_HW_VLAN_FILTER;
>
> err = register_netdev(dev);
> if (err) {
> @@ -1039,14 +1280,21 @@ static int virtnet_probe(struct virtio_device *vdev)
> }
>
> /* Last of all, set up some receive buffers. */
> - try_fill_recv(vi, GFP_KERNEL);
> -
> - /* If we didn't even get one input buffer, we're useless. */
> - if (vi->num == 0) {
> - err = -ENOMEM;
> - goto unregister;
> + for (i = 0; i < numtxqs; i++) {
> + try_fill_recv(vi->rq[i], GFP_KERNEL);
> +
> + /* If we didn't even get one input buffer, we're useless. */
> + if (vi->rq[i]->num == 0) {
> + if (i)
> + free_unused_bufs(vi);
> + err = -ENOMEM;
> + goto free_recv_bufs;
> + }
> }
>
> + dev_info(&dev->dev, "(virtio-net) Allocated %d RX & TX vq's\n",
> + numtxqs);
> +
> /* Assume link up if device can't report link status,
> otherwise get link status from config. */
> if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_STATUS)) {
> @@ -1057,61 +1305,51 @@ static int virtnet_probe(struct virtio_device *vdev)
> netif_carrier_on(dev);
> }
>
> - pr_debug("virtnet: registered device %s\n", dev->name);
> + pr_debug("virtnet: registered device %s with %d RX and TX vq's\n",
> + dev->name, numtxqs);
> return 0;
>
> -unregister:
> +free_recv_bufs:
> + free_receive_bufs(vi);
> unregister_netdev(dev);
> - cancel_delayed_work_sync(&vi->refill);
> +
> free_vqs:
> + for (i = 0; i < numtxqs; i++)
> + cancel_delayed_work_sync(&vi->rq[i]->refill);
> vdev->config->del_vqs(vdev);
> + free_rq_sq(vi);
> +
> free_stats:
> free_percpu(vi->stats);
> +
> free:
> free_netdev(dev);
> return err;
> }
>
> -static void free_unused_bufs(struct virtnet_info *vi)
> -{
> - void *buf;
> - while (1) {
> - buf = virtqueue_detach_unused_buf(vi->svq);
> - if (!buf)
> - break;
> - dev_kfree_skb(buf);
> - }
> - while (1) {
> - buf = virtqueue_detach_unused_buf(vi->rvq);
> - if (!buf)
> - break;
> - if (vi->mergeable_rx_bufs || vi->big_packets)
> - give_pages(vi, buf);
> - else
> - dev_kfree_skb(buf);
> - --vi->num;
> - }
> - BUG_ON(vi->num != 0);
> -}
> -
> static void __devexit virtnet_remove(struct virtio_device *vdev)
> {
> struct virtnet_info *vi = vdev->priv;
> + int i;
>
> /* Stop all the virtqueues. */
> vdev->config->reset(vdev);
>
>
> unregister_netdev(vi->dev);
> - cancel_delayed_work_sync(&vi->refill);
> +
> + for (i = 0; i < vi->numtxqs; i++)
> + cancel_delayed_work_sync(&vi->rq[i]->refill);
>
> /* Free unused buffers in both send and recv, if any. */
> free_unused_bufs(vi);
>
> vdev->config->del_vqs(vi->vdev);
>
> - while (vi->pages)
> - __free_pages(get_a_page(vi, GFP_KERNEL), 0);
> + free_receive_bufs(vi);
> +
> + /* Free memory for send and receive queues */
> + free_rq_sq(vi);
>
> free_percpu(vi->stats);
> free_netdev(vi->dev);
> @@ -1129,7 +1367,7 @@ static unsigned int features[] = {
> VIRTIO_NET_F_HOST_ECN, VIRTIO_NET_F_GUEST_TSO4, VIRTIO_NET_F_GUEST_TSO6,
> VIRTIO_NET_F_GUEST_ECN, VIRTIO_NET_F_GUEST_UFO,
> VIRTIO_NET_F_MRG_RXBUF, VIRTIO_NET_F_STATUS, VIRTIO_NET_F_CTRL_VQ,
> - VIRTIO_NET_F_CTRL_RX, VIRTIO_NET_F_CTRL_VLAN,
> + VIRTIO_NET_F_CTRL_RX, VIRTIO_NET_F_CTRL_VLAN, VIRTIO_NET_F_MULTIQUEUE,
> };
>
> static struct virtio_driver virtio_net_driver = {
> diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h
> index 970d5a2..fa85ac3 100644
> --- a/include/linux/virtio_net.h
> +++ b/include/linux/virtio_net.h
> @@ -49,6 +49,7 @@
> #define VIRTIO_NET_F_CTRL_RX 18 /* Control channel RX mode support */
> #define VIRTIO_NET_F_CTRL_VLAN 19 /* Control channel VLAN filtering */
> #define VIRTIO_NET_F_CTRL_RX_EXTRA 20 /* Extra RX mode control support */
> +#define VIRTIO_NET_F_MULTIQUEUE 21 /* Device supports multiple TXQ/RXQ */
>
> #define VIRTIO_NET_S_LINK_UP 1 /* Link is up */
>
> @@ -57,6 +58,8 @@ struct virtio_net_config {
> __u8 mac[6];
> /* See VIRTIO_NET_F_STATUS and VIRTIO_NET_S_* above */
> __u16 status;
> + /* total number of RX/TX queues */
> + __u16 num_queue_pairs;
> } __attribute__((packed));
>
> /* This is the first element of the scatter-gather list. If you don't
>
>
--
Sasha.
^ 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