* Re: [net-next,v4 04/12] bna: TX Path and RX Path Changes
From: David Miller @ 2011-08-23 23:22 UTC (permalink / raw)
To: rmody; +Cc: netdev, adapter_linux_open_src_team, gkaraje
In-Reply-To: <1314122168-14314-5-git-send-email-rmody@brocade.com>
From: Rasesh Mody <rmody@brocade.com>
Date: Tue, 23 Aug 2011 10:56:00 -0700
> + BNA_QE_INDX_ADD(_index, 1, _depth); \
> + for (j = 0; j < (_frag); j++) { \
> + prefetch(&(_array)[(_index) + 1]); \
> + dma_unmap_page(_pdev, dma_unmap_addr(&(_array)[_index], \
This prefetch is excessive and a waste of cpu cycles.
You're going to prefetch a full 64-byte (or even 128-byte) cache line
for every 16-byte blob (at best) you iterate over. This means you'll
prefetch the same cache line, needlessly, over and over again.
This is a really terrible patch series, and I'm frankly exhausted from
reviewing it. I don't want to see another revision of this series for
at least one week. Read it over carefully, meanwhile.
There is very little thought, and way too much arbitrary tinkering
going on in this driver.
^ permalink raw reply
* Re: [net-next,v4 04/12] bna: TX Path and RX Path Changes
From: David Miller @ 2011-08-23 23:24 UTC (permalink / raw)
To: rmody; +Cc: netdev, adapter_linux_open_src_team, gkaraje
In-Reply-To: <20110823.162220.1108826596231524649.davem@davemloft.net>
From: David Miller <davem@davemloft.net>
Date: Tue, 23 Aug 2011 16:22:20 -0700 (PDT)
> From: Rasesh Mody <rmody@brocade.com>
> Date: Tue, 23 Aug 2011 10:56:00 -0700
>
>> + BNA_QE_INDX_ADD(_index, 1, _depth); \
>> + for (j = 0; j < (_frag); j++) { \
>> + prefetch(&(_array)[(_index) + 1]); \
>> + dma_unmap_page(_pdev, dma_unmap_addr(&(_array)[_index], \
>
> This prefetch is excessive and a waste of cpu cycles.
>
> You're going to prefetch a full 64-byte (or even 128-byte) cache line
> for every 16-byte blob (at best) you iterate over. This means you'll
> prefetch the same cache line, needlessly, over and over again.
Also this whole idea to macroize this operation is bad.
Use a real seperate C function if you want to avoid code duplicaiton.
Don't mark it inline, let the compiler take care of that.
Otherwise you're sacrificing type safety and risking the usual problems
created by macros (multiple variable evaluation etc.).
^ permalink raw reply
* Interface without IP address can route??
From: Ben Greear @ 2011-08-24 0:20 UTC (permalink / raw)
To: netdev
I just noticed on a 3.0.1 kernel that the system is routing packets
received on an interface without an IP address. (I was trying to use the
interface in a user-space wifi_station-to-wired bridge application).
[root@lf0301-demo1 lanforge]# cat /proc/sys/net/ipv4/conf/sta1/forwarding
1
[root@lf0301-demo1 lanforge]# ifconfig sta1
sta1 Link encap:Ethernet HWaddr 00:03:2D:12:16:0D
UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1
RX packets:85248 errors:0 dropped:0 overruns:0 frame:0
TX packets:1419 errors:0 dropped:0 overruns:0 carrier:0
collisions:0 txqueuelen:1000
RX bytes:67423391 (64.2 MiB) TX bytes:1087581 (1.0 MiB)
Seems that older stock kernels have forwarding set for interfaces without
IP addresses too, so maybe it's always been this way...
Anyway, I can add some logic to my config to explicitly disable
routing for interfaces w/out IP address, but it seems to me that
it should automatically not route packets received on an interface
that had no IP address on it..
Thanks,
Ben
--
Ben Greear <greearb@candelatech.com>
Candela Technologies Inc http://www.candelatech.com
^ permalink raw reply
* Re: linux-next: manual merge of the net tree with the unicore32 tree
From: Guan Xuetao @ 2011-08-24 1:28 UTC (permalink / raw)
To: jeffrey.t.kirsher
Cc: Stephen Rothwell, David Miller, netdev@vger.kernel.org,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Zhang Shu, Chu Xiaowei, Su Yonggang
In-Reply-To: <1314090049.2128.224.camel@jtkirshe-mobl>
On Tue, 2011-08-23 at 02:00 -0700, Jeff Kirsher wrote:
> On Mon, 2011-08-22 at 20:02 -0700, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the net tree got conflicts in
> > drivers/net/Kconfig and drivers/net/Makefile between commit
> > e8787de6fa83
> > ("unicore32: add pkunity-v3 mac/net driver (umal)") from the unicore32
> > tree and the network driver rearrangement from the net tree.
> >
> > I just added the new driver from the unicore32 tree commit into each
> > file
> > (see below).
> > --
> > Cheers,
> > Stephen Rothwell sfr@canb.auug.org.au
>
> Hmm, well with the latest series of patches I sent out, I am pretty sure
> this patch would not apply.
Ok, I see.
Thanks Jeff, and thanks Stephen.
Guan Xuetao
>
> Is it best that this patch not be sent to netdev for driver
> inclusion? :)
^ permalink raw reply
* Re: [net-next 00/10][pull request] Intel Wired LAN Driver Update
From: Jeff Kirsher @ 2011-08-24 2:34 UTC (permalink / raw)
To: David Miller; +Cc: netdev@vger.kernel.org, gospo@redhat.com
In-Reply-To: <20110823.154548.1870719393143742013.davem@davemloft.net>
[-- Attachment #1: Type: text/plain, Size: 883 bytes --]
On Tue, 2011-08-23 at 15:45 -0700, David Miller wrote:
> From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Sun, 21 Aug 2011 00:29:11 -0700
>
> > The following series contains updates to ixgbe.
> >
> > The following are changes since commit ca1ba7caa68520864e4b9227e67f3bbc6fed373b:
> > Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next
> > and are available in the git repository at:
> > master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next master
>
> Alexander says he is going to respin patch #3, so I'm dropping this and
> waiting for the next submission.
I agree, I have been following the thread. I know know Alex will work
on re-working the patch, in the meantime I will review the ixgbe-patches
ready to be submitted which are not affected by the changes in patch 3
and push those while I await.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: [net-next 0/9][pull request] Complete drivers/net/ move
From: Jeff Kirsher @ 2011-08-24 2:39 UTC (permalink / raw)
To: David Miller; +Cc: netdev@vger.kernel.org, gospo@redhat.com
In-Reply-To: <20110823.161209.503161978488308532.davem@davemloft.net>
[-- Attachment #1: Type: text/plain, Size: 2163 bytes --]
On Tue, 2011-08-23 at 16:12 -0700, David Miller wrote:
> From: David Miller <davem@davemloft.net>
> Date: Tue, 23 Aug 2011 15:41:57 -0700 (PDT)
>
> > From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Tue, 23 Aug 2011 01:45:40 -0700
> >
> >> The following series moves the FDDI, PPP, HIPPI, PLIP, SLIP and the cleanup
> >> of the drivers/net/ Kconfig & Makefile's. This series in addition moves
> >> the 2 remaining drivers in drivers/net/pcmcia/ into their respective
> >> directories (arcnet & tokenring). The last remaining change is to
> >> make the all the "new" Kconfig options introduced by the Ethernet
> >> drivers move to yes, so that current defconfig's will compile the expected
> >> drivers.
> >>
> >> The following are changes since commit ca1ba7caa68520864e4b9227e67f3bbc6fed373b:
> >> Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next
> >> and are available in the git repository at:
> >> master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/next-organize master
> >
> > I pulled this, but because you changed FDDI and these other newly
> > moved subsystems from a "config FOO" into a "menuconfig FOO", it now
> > prompts for those too during the first oldconfig.
>
> I had to unpull, this breaks the build, see the skfddi errors below.
>
> Also, you can't change "config" into "menuconfig", it makes things
> that were previously buildable modular no longer able to be.
>
> include/config/auto.conf:2204:warning: symbol value 'm' invalid for FDDI
> include/config/auto.conf:3764:warning: symbol value 'm' invalid for ARCNET
> include/config/auto.conf:4044:warning: symbol value 'm' invalid for TR
> include/config/auto.conf:4700:warning: symbol value 'm' invalid for PPP
Grrr, I did not see or find any reason for FDDI, ARCNET, Tokenring or
PPP to loaded as a module. That was the reason for the change, sorry.
I was seeing the Group Heading for these technologies as just that,
headers (like Ethernet). I will revert that change.
I will also fix up the new Kconfig options like I did for the new
Ethernet Kconfig options. (default y).
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: [PATCH] iptables/man: IPv6 TOS mangling fix was backported to 2.6.35-longterm too
From: Fernando Luis Vazquez Cao @ 2011-08-24 2:55 UTC (permalink / raw)
To: Patrick McHardy
Cc: Jan Engelhardt, Netfilter Developer Mailing List,
Linux Networking Developer Mailing List
In-Reply-To: <1312246840.8407.2.camel@nexus.oss.ntt.co.jp>
Fernando Luis Vázquez Cao wrote:
> Update man page accordingly.
>
> Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
> ---
>
> diff -urNp iptables-orig/extensions/libxt_TOS.man iptables/extensions/libxt_TOS.man
> --- iptables-orig/extensions/libxt_TOS.man 2011-07-11 17:41:10.000000000 +0900
> +++ iptables/extensions/libxt_TOS.man 2011-08-02 09:59:27.356614494 +0900
> @@ -28,9 +28,9 @@ Binary XOR the TOS value with \fIbits\fP
> \fIbits\fP\fB/0\fP. See NOTE below.)
> .PP
> NOTE: In Linux kernels up to and including 2.6.38, with the exception of
> -longterm releases 2.6.32.42 (or later) and 2.6.33.15 (or later), there is a bug
> -whereby IPv6 TOS mangling does not behave as documented and differs from the
> -IPv4 version. The TOS mask indicates the bits one wants to zero out, so it needs
> -to be inverted before applying it to the original TOS field. However, the
> +longterm releases 2.6.32 (>=.42), 2.6.33 (>=.15), and 2.6.35 (>=.14), there is
> +a bug whereby IPv6 TOS mangling does not behave as documented and differs from
> +the IPv4 version. The TOS mask indicates the bits one wants to zero out, so it
> +needs to be inverted before applying it to the original TOS field. However, the
> aformentioned kernels forgo the inversion which breaks --set-tos and its
> mnemonics.
Ping?
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* [net-next 0/9][pull request] Complete drivers/net/ move
From: Jeff Kirsher @ 2011-08-24 4:39 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo
The following series moves the FDDI, PPP, HIPPI, PLIP, SLIP and the cleanup
of the drivers/net/ Kconfig & Makefile's. This series in addition moves
the 2 remaining drivers in drivers/net/pcmcia/ into their respective
directories (arcnet & tokenring). The last remaining change is to
make the all the "new" Kconfig options introduced by the Ethernet
drivers move to yes, so that current defconfig's will compile the expected
drivers.
v2- remove the changes for FDDI, HIPPI, PPP, etc Kconfig from menuconfig back
to config and used tristate instead of bool. Apparently some configs load
FDDI and others as a module.
The following are changes since commit 131ea6675c761f655d43b808dd0fe83d15d5cdd3:
net: add APIs for manipulating skb page fragments.
and are available in the git repository at:
master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/next-organize master
Jeff Kirsher (9):
fddi: Move the FDDI drivers
ppp: Move the PPP drivers
hippi: Move the HIPPI driver
plip: Move the PLIP driver
slip: Move the SLIP drivers
ixbmtr_cs: Move the IBM PCMCIA Token Ring driver
com20020_cs: Move the PCMCIA Arcnet driver
drivers/net: Kconfig & Makefile cleanup
drivers/net/ethernet/*: Enabled vendor Kconfig options
MAINTAINERS | 11 +-
drivers/net/Kconfig | 640 ++++++--------------------
drivers/net/Makefile | 84 ++--
drivers/net/arcnet/Kconfig | 14 +-
drivers/net/arcnet/Makefile | 1 +
drivers/net/{pcmcia => arcnet}/com20020_cs.c | 0
drivers/net/ethernet/3com/Kconfig | 1 +
drivers/net/ethernet/8390/Kconfig | 1 +
drivers/net/ethernet/adaptec/Kconfig | 1 +
drivers/net/ethernet/alteon/Kconfig | 1 +
drivers/net/ethernet/amd/Kconfig | 1 +
drivers/net/ethernet/apple/Kconfig | 1 +
drivers/net/ethernet/atheros/Kconfig | 1 +
drivers/net/ethernet/broadcom/Kconfig | 1 +
drivers/net/ethernet/brocade/Kconfig | 1 +
drivers/net/ethernet/chelsio/Kconfig | 1 +
drivers/net/ethernet/cirrus/Kconfig | 1 +
drivers/net/ethernet/cisco/Kconfig | 1 +
drivers/net/ethernet/dec/Kconfig | 1 +
drivers/net/ethernet/dlink/Kconfig | 1 +
drivers/net/ethernet/emulex/Kconfig | 1 +
drivers/net/ethernet/faraday/Kconfig | 1 +
drivers/net/ethernet/freescale/Kconfig | 1 +
drivers/net/ethernet/fujitsu/Kconfig | 1 +
drivers/net/ethernet/hp/Kconfig | 1 +
drivers/net/ethernet/i825xx/Kconfig | 1 +
drivers/net/ethernet/ibm/Kconfig | 1 +
drivers/net/ethernet/intel/Kconfig | 1 +
drivers/net/ethernet/marvell/Kconfig | 1 +
drivers/net/ethernet/mellanox/Kconfig | 1 +
drivers/net/ethernet/micrel/Kconfig | 1 +
drivers/net/ethernet/microchip/Kconfig | 1 +
drivers/net/ethernet/myricom/Kconfig | 1 +
drivers/net/ethernet/natsemi/Kconfig | 1 +
drivers/net/ethernet/neterion/Kconfig | 1 +
drivers/net/ethernet/nuvoton/Kconfig | 1 +
drivers/net/ethernet/nvidia/Kconfig | 1 +
drivers/net/ethernet/oki-semi/Kconfig | 1 +
drivers/net/ethernet/pasemi/Kconfig | 1 +
drivers/net/ethernet/qlogic/Kconfig | 1 +
drivers/net/ethernet/racal/Kconfig | 1 +
drivers/net/ethernet/rdc/Kconfig | 1 +
drivers/net/ethernet/realtek/Kconfig | 1 +
drivers/net/ethernet/seeq/Kconfig | 1 +
drivers/net/ethernet/sgi/Kconfig | 1 +
drivers/net/ethernet/sis/Kconfig | 1 +
drivers/net/ethernet/smsc/Kconfig | 1 +
drivers/net/ethernet/stmicro/Kconfig | 1 +
drivers/net/ethernet/sun/Kconfig | 1 +
drivers/net/ethernet/tehuti/Kconfig | 1 +
drivers/net/ethernet/ti/Kconfig | 1 +
drivers/net/ethernet/toshiba/Kconfig | 1 +
drivers/net/ethernet/tundra/Kconfig | 1 +
drivers/net/ethernet/via/Kconfig | 1 +
drivers/net/ethernet/xilinx/Kconfig | 1 +
drivers/net/ethernet/xircom/Kconfig | 1 +
drivers/net/ethernet/xscale/Kconfig | 1 +
drivers/net/fddi/Kconfig | 77 +++
drivers/net/fddi/Makefile | 6 +
drivers/net/{ => fddi}/defxx.c | 0
drivers/net/{ => fddi}/defxx.h | 0
drivers/net/{ => fddi}/skfp/Makefile | 0
drivers/net/{ => fddi}/skfp/cfm.c | 0
drivers/net/{ => fddi}/skfp/drvfbi.c | 0
drivers/net/{ => fddi}/skfp/ecm.c | 0
drivers/net/{ => fddi}/skfp/ess.c | 0
drivers/net/{ => fddi}/skfp/fplustm.c | 0
drivers/net/{ => fddi}/skfp/h/cmtdef.h | 0
drivers/net/{ => fddi}/skfp/h/fddi.h | 0
drivers/net/{ => fddi}/skfp/h/fddimib.h | 0
drivers/net/{ => fddi}/skfp/h/fplustm.h | 0
drivers/net/{ => fddi}/skfp/h/hwmtm.h | 0
drivers/net/{ => fddi}/skfp/h/mbuf.h | 0
drivers/net/{ => fddi}/skfp/h/osdef1st.h | 0
drivers/net/{ => fddi}/skfp/h/sba.h | 0
drivers/net/{ => fddi}/skfp/h/sba_def.h | 0
drivers/net/{ => fddi}/skfp/h/skfbi.h | 0
drivers/net/{ => fddi}/skfp/h/skfbiinc.h | 0
drivers/net/{ => fddi}/skfp/h/smc.h | 0
drivers/net/{ => fddi}/skfp/h/smt.h | 0
drivers/net/{ => fddi}/skfp/h/smt_p.h | 0
drivers/net/{ => fddi}/skfp/h/smtstate.h | 0
drivers/net/{ => fddi}/skfp/h/supern_2.h | 0
drivers/net/{ => fddi}/skfp/h/targethw.h | 0
drivers/net/{ => fddi}/skfp/h/targetos.h | 0
drivers/net/{ => fddi}/skfp/h/types.h | 0
drivers/net/{ => fddi}/skfp/hwmtm.c | 0
drivers/net/{ => fddi}/skfp/hwt.c | 0
drivers/net/{ => fddi}/skfp/pcmplc.c | 0
drivers/net/{ => fddi}/skfp/pmf.c | 0
drivers/net/{ => fddi}/skfp/queue.c | 0
drivers/net/{ => fddi}/skfp/rmt.c | 0
drivers/net/{ => fddi}/skfp/skfddi.c | 0
drivers/net/{ => fddi}/skfp/smt.c | 0
drivers/net/{ => fddi}/skfp/smtdef.c | 0
drivers/net/{ => fddi}/skfp/smtinit.c | 0
drivers/net/{ => fddi}/skfp/smttimer.c | 0
drivers/net/{ => fddi}/skfp/srf.c | 0
drivers/net/hippi/Kconfig | 39 ++
drivers/net/hippi/Makefile | 5 +
drivers/net/{ => hippi}/rrunner.c | 0
drivers/net/{ => hippi}/rrunner.h | 0
drivers/net/pcmcia/Kconfig | 45 --
drivers/net/pcmcia/Makefile | 8 -
drivers/net/phy/Kconfig | 2 +-
drivers/net/plip/Kconfig | 38 ++
drivers/net/plip/Makefile | 5 +
drivers/net/{ => plip}/plip.c | 0
drivers/net/ppp/Kconfig | 176 +++++++
drivers/net/ppp/Makefile | 13 +
drivers/net/{ => ppp}/bsd_comp.c | 0
drivers/net/{ => ppp}/ppp_async.c | 0
drivers/net/{ => ppp}/ppp_deflate.c | 0
drivers/net/{ => ppp}/ppp_generic.c | 0
drivers/net/{ => ppp}/ppp_mppe.c | 0
drivers/net/{ => ppp}/ppp_mppe.h | 0
drivers/net/{ => ppp}/ppp_synctty.c | 0
drivers/net/{ => ppp}/pppoe.c | 0
drivers/net/{ => ppp}/pppox.c | 0
drivers/net/{ => ppp}/pptp.c | 0
drivers/net/slip/Kconfig | 79 ++++
drivers/net/slip/Makefile | 6 +
drivers/net/{ => slip}/slhc.c | 0
drivers/net/{ => slip}/slip.c | 0
drivers/net/{ => slip}/slip.h | 0
drivers/net/tokenring/Kconfig | 15 +-
drivers/net/tokenring/Makefile | 21 +-
drivers/net/{pcmcia => tokenring}/ibmtr_cs.c | 2 +-
128 files changed, 710 insertions(+), 628 deletions(-)
rename drivers/net/{pcmcia => arcnet}/com20020_cs.c (100%)
create mode 100644 drivers/net/fddi/Kconfig
create mode 100644 drivers/net/fddi/Makefile
rename drivers/net/{ => fddi}/defxx.c (100%)
rename drivers/net/{ => fddi}/defxx.h (100%)
rename drivers/net/{ => fddi}/skfp/Makefile (100%)
rename drivers/net/{ => fddi}/skfp/cfm.c (100%)
rename drivers/net/{ => fddi}/skfp/drvfbi.c (100%)
rename drivers/net/{ => fddi}/skfp/ecm.c (100%)
rename drivers/net/{ => fddi}/skfp/ess.c (100%)
rename drivers/net/{ => fddi}/skfp/fplustm.c (100%)
rename drivers/net/{ => fddi}/skfp/h/cmtdef.h (100%)
rename drivers/net/{ => fddi}/skfp/h/fddi.h (100%)
rename drivers/net/{ => fddi}/skfp/h/fddimib.h (100%)
rename drivers/net/{ => fddi}/skfp/h/fplustm.h (100%)
rename drivers/net/{ => fddi}/skfp/h/hwmtm.h (100%)
rename drivers/net/{ => fddi}/skfp/h/mbuf.h (100%)
rename drivers/net/{ => fddi}/skfp/h/osdef1st.h (100%)
rename drivers/net/{ => fddi}/skfp/h/sba.h (100%)
rename drivers/net/{ => fddi}/skfp/h/sba_def.h (100%)
rename drivers/net/{ => fddi}/skfp/h/skfbi.h (100%)
rename drivers/net/{ => fddi}/skfp/h/skfbiinc.h (100%)
rename drivers/net/{ => fddi}/skfp/h/smc.h (100%)
rename drivers/net/{ => fddi}/skfp/h/smt.h (100%)
rename drivers/net/{ => fddi}/skfp/h/smt_p.h (100%)
rename drivers/net/{ => fddi}/skfp/h/smtstate.h (100%)
rename drivers/net/{ => fddi}/skfp/h/supern_2.h (100%)
rename drivers/net/{ => fddi}/skfp/h/targethw.h (100%)
rename drivers/net/{ => fddi}/skfp/h/targetos.h (100%)
rename drivers/net/{ => fddi}/skfp/h/types.h (100%)
rename drivers/net/{ => fddi}/skfp/hwmtm.c (100%)
rename drivers/net/{ => fddi}/skfp/hwt.c (100%)
rename drivers/net/{ => fddi}/skfp/pcmplc.c (100%)
rename drivers/net/{ => fddi}/skfp/pmf.c (100%)
rename drivers/net/{ => fddi}/skfp/queue.c (100%)
rename drivers/net/{ => fddi}/skfp/rmt.c (100%)
rename drivers/net/{ => fddi}/skfp/skfddi.c (100%)
rename drivers/net/{ => fddi}/skfp/smt.c (100%)
rename drivers/net/{ => fddi}/skfp/smtdef.c (100%)
rename drivers/net/{ => fddi}/skfp/smtinit.c (100%)
rename drivers/net/{ => fddi}/skfp/smttimer.c (100%)
rename drivers/net/{ => fddi}/skfp/srf.c (100%)
create mode 100644 drivers/net/hippi/Kconfig
create mode 100644 drivers/net/hippi/Makefile
rename drivers/net/{ => hippi}/rrunner.c (100%)
rename drivers/net/{ => hippi}/rrunner.h (100%)
delete mode 100644 drivers/net/pcmcia/Kconfig
delete mode 100644 drivers/net/pcmcia/Makefile
create mode 100644 drivers/net/plip/Kconfig
create mode 100644 drivers/net/plip/Makefile
rename drivers/net/{ => plip}/plip.c (100%)
create mode 100644 drivers/net/ppp/Kconfig
create mode 100644 drivers/net/ppp/Makefile
rename drivers/net/{ => ppp}/bsd_comp.c (100%)
rename drivers/net/{ => ppp}/ppp_async.c (100%)
rename drivers/net/{ => ppp}/ppp_deflate.c (100%)
rename drivers/net/{ => ppp}/ppp_generic.c (100%)
rename drivers/net/{ => ppp}/ppp_mppe.c (100%)
rename drivers/net/{ => ppp}/ppp_mppe.h (100%)
rename drivers/net/{ => ppp}/ppp_synctty.c (100%)
rename drivers/net/{ => ppp}/pppoe.c (100%)
rename drivers/net/{ => ppp}/pppox.c (100%)
rename drivers/net/{ => ppp}/pptp.c (100%)
create mode 100644 drivers/net/slip/Kconfig
create mode 100644 drivers/net/slip/Makefile
rename drivers/net/{ => slip}/slhc.c (100%)
rename drivers/net/{ => slip}/slip.c (100%)
rename drivers/net/{ => slip}/slip.h (100%)
rename drivers/net/{pcmcia => tokenring}/ibmtr_cs.c (99%)
--
1.7.6
^ permalink raw reply
* [net-next 1/9] fddi: Move the FDDI drivers
From: Jeff Kirsher @ 2011-08-24 4:39 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, Maciej W. Rozycki, Christoph Goos,
linux
In-Reply-To: <1314160774-6980-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the FDDI drivers into drivers/net/fddi/ and make the
necessary Kconfig and Makefile changes.
CC: "Maciej W. Rozycki" <macro@linux-mips.org>
CC: Christoph Goos <cgoos@syskonnect.de>
CC: <linux@syskonnect.de>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 2 +-
drivers/net/Kconfig | 72 +---------------------------
drivers/net/Makefile | 3 +-
drivers/net/fddi/Kconfig | 77 ++++++++++++++++++++++++++++++
drivers/net/fddi/Makefile | 6 ++
drivers/net/{ => fddi}/defxx.c | 0
drivers/net/{ => fddi}/defxx.h | 0
drivers/net/{ => fddi}/skfp/Makefile | 0
drivers/net/{ => fddi}/skfp/cfm.c | 0
drivers/net/{ => fddi}/skfp/drvfbi.c | 0
drivers/net/{ => fddi}/skfp/ecm.c | 0
drivers/net/{ => fddi}/skfp/ess.c | 0
drivers/net/{ => fddi}/skfp/fplustm.c | 0
drivers/net/{ => fddi}/skfp/h/cmtdef.h | 0
drivers/net/{ => fddi}/skfp/h/fddi.h | 0
drivers/net/{ => fddi}/skfp/h/fddimib.h | 0
drivers/net/{ => fddi}/skfp/h/fplustm.h | 0
drivers/net/{ => fddi}/skfp/h/hwmtm.h | 0
drivers/net/{ => fddi}/skfp/h/mbuf.h | 0
drivers/net/{ => fddi}/skfp/h/osdef1st.h | 0
drivers/net/{ => fddi}/skfp/h/sba.h | 0
drivers/net/{ => fddi}/skfp/h/sba_def.h | 0
drivers/net/{ => fddi}/skfp/h/skfbi.h | 0
drivers/net/{ => fddi}/skfp/h/skfbiinc.h | 0
drivers/net/{ => fddi}/skfp/h/smc.h | 0
drivers/net/{ => fddi}/skfp/h/smt.h | 0
drivers/net/{ => fddi}/skfp/h/smt_p.h | 0
drivers/net/{ => fddi}/skfp/h/smtstate.h | 0
drivers/net/{ => fddi}/skfp/h/supern_2.h | 0
drivers/net/{ => fddi}/skfp/h/targethw.h | 0
drivers/net/{ => fddi}/skfp/h/targetos.h | 0
drivers/net/{ => fddi}/skfp/h/types.h | 0
drivers/net/{ => fddi}/skfp/hwmtm.c | 0
drivers/net/{ => fddi}/skfp/hwt.c | 0
drivers/net/{ => fddi}/skfp/pcmplc.c | 0
drivers/net/{ => fddi}/skfp/pmf.c | 0
drivers/net/{ => fddi}/skfp/queue.c | 0
drivers/net/{ => fddi}/skfp/rmt.c | 0
drivers/net/{ => fddi}/skfp/skfddi.c | 0
drivers/net/{ => fddi}/skfp/smt.c | 0
drivers/net/{ => fddi}/skfp/smtdef.c | 0
drivers/net/{ => fddi}/skfp/smtinit.c | 0
drivers/net/{ => fddi}/skfp/smttimer.c | 0
drivers/net/{ => fddi}/skfp/srf.c | 0
44 files changed, 87 insertions(+), 73 deletions(-)
create mode 100644 drivers/net/fddi/Kconfig
create mode 100644 drivers/net/fddi/Makefile
rename drivers/net/{ => fddi}/defxx.c (100%)
rename drivers/net/{ => fddi}/defxx.h (100%)
rename drivers/net/{ => fddi}/skfp/Makefile (100%)
rename drivers/net/{ => fddi}/skfp/cfm.c (100%)
rename drivers/net/{ => fddi}/skfp/drvfbi.c (100%)
rename drivers/net/{ => fddi}/skfp/ecm.c (100%)
rename drivers/net/{ => fddi}/skfp/ess.c (100%)
rename drivers/net/{ => fddi}/skfp/fplustm.c (100%)
rename drivers/net/{ => fddi}/skfp/h/cmtdef.h (100%)
rename drivers/net/{ => fddi}/skfp/h/fddi.h (100%)
rename drivers/net/{ => fddi}/skfp/h/fddimib.h (100%)
rename drivers/net/{ => fddi}/skfp/h/fplustm.h (100%)
rename drivers/net/{ => fddi}/skfp/h/hwmtm.h (100%)
rename drivers/net/{ => fddi}/skfp/h/mbuf.h (100%)
rename drivers/net/{ => fddi}/skfp/h/osdef1st.h (100%)
rename drivers/net/{ => fddi}/skfp/h/sba.h (100%)
rename drivers/net/{ => fddi}/skfp/h/sba_def.h (100%)
rename drivers/net/{ => fddi}/skfp/h/skfbi.h (100%)
rename drivers/net/{ => fddi}/skfp/h/skfbiinc.h (100%)
rename drivers/net/{ => fddi}/skfp/h/smc.h (100%)
rename drivers/net/{ => fddi}/skfp/h/smt.h (100%)
rename drivers/net/{ => fddi}/skfp/h/smt_p.h (100%)
rename drivers/net/{ => fddi}/skfp/h/smtstate.h (100%)
rename drivers/net/{ => fddi}/skfp/h/supern_2.h (100%)
rename drivers/net/{ => fddi}/skfp/h/targethw.h (100%)
rename drivers/net/{ => fddi}/skfp/h/targetos.h (100%)
rename drivers/net/{ => fddi}/skfp/h/types.h (100%)
rename drivers/net/{ => fddi}/skfp/hwmtm.c (100%)
rename drivers/net/{ => fddi}/skfp/hwt.c (100%)
rename drivers/net/{ => fddi}/skfp/pcmplc.c (100%)
rename drivers/net/{ => fddi}/skfp/pmf.c (100%)
rename drivers/net/{ => fddi}/skfp/queue.c (100%)
rename drivers/net/{ => fddi}/skfp/rmt.c (100%)
rename drivers/net/{ => fddi}/skfp/skfddi.c (100%)
rename drivers/net/{ => fddi}/skfp/smt.c (100%)
rename drivers/net/{ => fddi}/skfp/smtdef.c (100%)
rename drivers/net/{ => fddi}/skfp/smtinit.c (100%)
rename drivers/net/{ => fddi}/skfp/smttimer.c (100%)
rename drivers/net/{ => fddi}/skfp/srf.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index d32e1ca..2777088 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2113,7 +2113,7 @@ F: net/decnet/
DEFXX FDDI NETWORK DRIVER
M: "Maciej W. Rozycki" <macro@linux-mips.org>
S: Maintained
-F: drivers/net/defxx.*
+F: drivers/net/fddi/defxx.*
DELL LAPTOP DRIVER
M: Matthew Garrett <mjg59@srcf.ucam.org>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index ef6b6be..7bdc22b 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -195,6 +195,8 @@ config SUNGEM_PHY
source "drivers/net/ethernet/Kconfig"
+source "drivers/net/fddi/Kconfig"
+
source "drivers/net/tokenring/Kconfig"
source "drivers/net/wireless/Kconfig"
@@ -268,76 +270,6 @@ config RIONET_RX_SIZE
depends on RIONET
default "128"
-config FDDI
- tristate "FDDI driver support"
- depends on (PCI || EISA || TC)
- help
- Fiber Distributed Data Interface is a high speed local area network
- design; essentially a replacement for high speed Ethernet. FDDI can
- run over copper or fiber. If you are connected to such a network and
- want a driver for the FDDI card in your computer, say Y here (and
- then also Y to the driver for your FDDI card, below). Most people
- will say N.
-
-config DEFXX
- tristate "Digital DEFTA/DEFEA/DEFPA adapter support"
- depends on FDDI && (PCI || EISA || TC)
- ---help---
- This is support for the DIGITAL series of TURBOchannel (DEFTA),
- EISA (DEFEA) and PCI (DEFPA) controllers which can connect you
- to a local FDDI network.
-
- To compile this driver as a module, choose M here: the module
- will be called defxx. If unsure, say N.
-
-config DEFXX_MMIO
- bool
- prompt "Use MMIO instead of PIO" if PCI || EISA
- depends on DEFXX
- default n if PCI || EISA
- default y
- ---help---
- This instructs the driver to use EISA or PCI memory-mapped I/O
- (MMIO) as appropriate instead of programmed I/O ports (PIO).
- Enabling this gives an improvement in processing time in parts
- of the driver, but it may cause problems with EISA (DEFEA)
- adapters. TURBOchannel does not have the concept of I/O ports,
- so MMIO is always used for these (DEFTA) adapters.
-
- If unsure, say N.
-
-config SKFP
- tristate "SysKonnect FDDI PCI support"
- depends on FDDI && PCI
- select BITREVERSE
- ---help---
- Say Y here if you have a SysKonnect FDDI PCI adapter.
- The following adapters are supported by this driver:
- - SK-5521 (SK-NET FDDI-UP)
- - SK-5522 (SK-NET FDDI-UP DAS)
- - SK-5541 (SK-NET FDDI-FP)
- - SK-5543 (SK-NET FDDI-LP)
- - SK-5544 (SK-NET FDDI-LP DAS)
- - SK-5821 (SK-NET FDDI-UP64)
- - SK-5822 (SK-NET FDDI-UP64 DAS)
- - SK-5841 (SK-NET FDDI-FP64)
- - SK-5843 (SK-NET FDDI-LP64)
- - SK-5844 (SK-NET FDDI-LP64 DAS)
- - Netelligent 100 FDDI DAS Fibre SC
- - Netelligent 100 FDDI SAS Fibre SC
- - Netelligent 100 FDDI DAS UTP
- - Netelligent 100 FDDI SAS UTP
- - Netelligent 100 FDDI SAS Fibre MIC
-
- Read <file:Documentation/networking/skfp.txt> for information about
- the driver.
-
- Questions concerning this driver can be addressed to:
- <linux@syskonnect.de>
-
- To compile this driver as a module, choose M here: the module
- will be called skfp. This is recommended.
-
config HIPPI
bool "HIPPI driver support (EXPERIMENTAL)"
depends on EXPERIMENTAL && INET && PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index c33009b..3087b27 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -14,7 +14,6 @@ obj-$(CONFIG_VMXNET3) += vmxnet3/
#
obj-$(CONFIG_PLIP) += plip.o
obj-$(CONFIG_ROADRUNNER) += rrunner.o
-obj-$(CONFIG_SKFP) += skfp/
obj-$(CONFIG_RIONET) += rionet.o
#
@@ -42,13 +41,13 @@ obj-$(CONFIG_DUMMY) += dummy.o
obj-$(CONFIG_IFB) += ifb.o
obj-$(CONFIG_MACVLAN) += macvlan.o
obj-$(CONFIG_MACVTAP) += macvtap.o
-obj-$(CONFIG_DEFXX) += defxx.o
obj-$(CONFIG_EQUALIZER) += eql.o
obj-$(CONFIG_TUN) += tun.o
obj-$(CONFIG_VETH) += veth.o
obj-$(CONFIG_DEV_APPLETALK) += appletalk/
obj-$(CONFIG_ETHERNET) += ethernet/
+obj-$(CONFIG_FDDI) += fddi/
obj-$(CONFIG_TR) += tokenring/
obj-$(CONFIG_WAN) += wan/
obj-$(CONFIG_ARCNET) += arcnet/
diff --git a/drivers/net/fddi/Kconfig b/drivers/net/fddi/Kconfig
new file mode 100644
index 0000000..3a424c8
--- /dev/null
+++ b/drivers/net/fddi/Kconfig
@@ -0,0 +1,77 @@
+#
+# FDDI network device configuration
+#
+
+config FDDI
+ tristate "FDDI driver support"
+ depends on PCI || EISA || TC
+ ---help---
+ Fiber Distributed Data Interface is a high speed local area network
+ design; essentially a replacement for high speed Ethernet. FDDI can
+ run over copper or fiber. If you are connected to such a network and
+ want a driver for the FDDI card in your computer, say Y here (and
+ then also Y to the driver for your FDDI card, below). Most people
+ will say N.
+
+if FDDI
+
+config DEFXX
+ tristate "Digital DEFTA/DEFEA/DEFPA adapter support"
+ depends on FDDI && (PCI || EISA || TC)
+ ---help---
+ This is support for the DIGITAL series of TURBOchannel (DEFTA),
+ EISA (DEFEA) and PCI (DEFPA) controllers which can connect you
+ to a local FDDI network.
+
+ To compile this driver as a module, choose M here: the module
+ will be called defxx. If unsure, say N.
+
+config DEFXX_MMIO
+ bool
+ prompt "Use MMIO instead of PIO" if PCI || EISA
+ depends on DEFXX
+ default n if PCI || EISA
+ default y
+ ---help---
+ This instructs the driver to use EISA or PCI memory-mapped I/O
+ (MMIO) as appropriate instead of programmed I/O ports (PIO).
+ Enabling this gives an improvement in processing time in parts
+ of the driver, but it may cause problems with EISA (DEFEA)
+ adapters. TURBOchannel does not have the concept of I/O ports,
+ so MMIO is always used for these (DEFTA) adapters.
+
+ If unsure, say N.
+
+config SKFP
+ tristate "SysKonnect FDDI PCI support"
+ depends on FDDI && PCI
+ select BITREVERSE
+ ---help---
+ Say Y here if you have a SysKonnect FDDI PCI adapter.
+ The following adapters are supported by this driver:
+ - SK-5521 (SK-NET FDDI-UP)
+ - SK-5522 (SK-NET FDDI-UP DAS)
+ - SK-5541 (SK-NET FDDI-FP)
+ - SK-5543 (SK-NET FDDI-LP)
+ - SK-5544 (SK-NET FDDI-LP DAS)
+ - SK-5821 (SK-NET FDDI-UP64)
+ - SK-5822 (SK-NET FDDI-UP64 DAS)
+ - SK-5841 (SK-NET FDDI-FP64)
+ - SK-5843 (SK-NET FDDI-LP64)
+ - SK-5844 (SK-NET FDDI-LP64 DAS)
+ - Netelligent 100 FDDI DAS Fibre SC
+ - Netelligent 100 FDDI SAS Fibre SC
+ - Netelligent 100 FDDI DAS UTP
+ - Netelligent 100 FDDI SAS UTP
+ - Netelligent 100 FDDI SAS Fibre MIC
+
+ Read <file:Documentation/networking/skfp.txt> for information about
+ the driver.
+
+ Questions concerning this driver can be addressed to:
+ <linux@syskonnect.de>
+
+ To compile this driver as a module, choose M here: the module
+ will be called skfp. This is recommended.
+
+endif # FDDI
diff --git a/drivers/net/fddi/Makefile b/drivers/net/fddi/Makefile
new file mode 100644
index 0000000..36da19c
--- /dev/null
+++ b/drivers/net/fddi/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the Linux FDDI network device drivers.
+#
+
+obj-$(CONFIG_DEFXX) += defxx.o
+obj-$(CONFIG_SKFP) += skfp/
diff --git a/drivers/net/defxx.c b/drivers/net/fddi/defxx.c
similarity index 100%
rename from drivers/net/defxx.c
rename to drivers/net/fddi/defxx.c
diff --git a/drivers/net/defxx.h b/drivers/net/fddi/defxx.h
similarity index 100%
rename from drivers/net/defxx.h
rename to drivers/net/fddi/defxx.h
diff --git a/drivers/net/skfp/Makefile b/drivers/net/fddi/skfp/Makefile
similarity index 100%
rename from drivers/net/skfp/Makefile
rename to drivers/net/fddi/skfp/Makefile
diff --git a/drivers/net/skfp/cfm.c b/drivers/net/fddi/skfp/cfm.c
similarity index 100%
rename from drivers/net/skfp/cfm.c
rename to drivers/net/fddi/skfp/cfm.c
diff --git a/drivers/net/skfp/drvfbi.c b/drivers/net/fddi/skfp/drvfbi.c
similarity index 100%
rename from drivers/net/skfp/drvfbi.c
rename to drivers/net/fddi/skfp/drvfbi.c
diff --git a/drivers/net/skfp/ecm.c b/drivers/net/fddi/skfp/ecm.c
similarity index 100%
rename from drivers/net/skfp/ecm.c
rename to drivers/net/fddi/skfp/ecm.c
diff --git a/drivers/net/skfp/ess.c b/drivers/net/fddi/skfp/ess.c
similarity index 100%
rename from drivers/net/skfp/ess.c
rename to drivers/net/fddi/skfp/ess.c
diff --git a/drivers/net/skfp/fplustm.c b/drivers/net/fddi/skfp/fplustm.c
similarity index 100%
rename from drivers/net/skfp/fplustm.c
rename to drivers/net/fddi/skfp/fplustm.c
diff --git a/drivers/net/skfp/h/cmtdef.h b/drivers/net/fddi/skfp/h/cmtdef.h
similarity index 100%
rename from drivers/net/skfp/h/cmtdef.h
rename to drivers/net/fddi/skfp/h/cmtdef.h
diff --git a/drivers/net/skfp/h/fddi.h b/drivers/net/fddi/skfp/h/fddi.h
similarity index 100%
rename from drivers/net/skfp/h/fddi.h
rename to drivers/net/fddi/skfp/h/fddi.h
diff --git a/drivers/net/skfp/h/fddimib.h b/drivers/net/fddi/skfp/h/fddimib.h
similarity index 100%
rename from drivers/net/skfp/h/fddimib.h
rename to drivers/net/fddi/skfp/h/fddimib.h
diff --git a/drivers/net/skfp/h/fplustm.h b/drivers/net/fddi/skfp/h/fplustm.h
similarity index 100%
rename from drivers/net/skfp/h/fplustm.h
rename to drivers/net/fddi/skfp/h/fplustm.h
diff --git a/drivers/net/skfp/h/hwmtm.h b/drivers/net/fddi/skfp/h/hwmtm.h
similarity index 100%
rename from drivers/net/skfp/h/hwmtm.h
rename to drivers/net/fddi/skfp/h/hwmtm.h
diff --git a/drivers/net/skfp/h/mbuf.h b/drivers/net/fddi/skfp/h/mbuf.h
similarity index 100%
rename from drivers/net/skfp/h/mbuf.h
rename to drivers/net/fddi/skfp/h/mbuf.h
diff --git a/drivers/net/skfp/h/osdef1st.h b/drivers/net/fddi/skfp/h/osdef1st.h
similarity index 100%
rename from drivers/net/skfp/h/osdef1st.h
rename to drivers/net/fddi/skfp/h/osdef1st.h
diff --git a/drivers/net/skfp/h/sba.h b/drivers/net/fddi/skfp/h/sba.h
similarity index 100%
rename from drivers/net/skfp/h/sba.h
rename to drivers/net/fddi/skfp/h/sba.h
diff --git a/drivers/net/skfp/h/sba_def.h b/drivers/net/fddi/skfp/h/sba_def.h
similarity index 100%
rename from drivers/net/skfp/h/sba_def.h
rename to drivers/net/fddi/skfp/h/sba_def.h
diff --git a/drivers/net/skfp/h/skfbi.h b/drivers/net/fddi/skfp/h/skfbi.h
similarity index 100%
rename from drivers/net/skfp/h/skfbi.h
rename to drivers/net/fddi/skfp/h/skfbi.h
diff --git a/drivers/net/skfp/h/skfbiinc.h b/drivers/net/fddi/skfp/h/skfbiinc.h
similarity index 100%
rename from drivers/net/skfp/h/skfbiinc.h
rename to drivers/net/fddi/skfp/h/skfbiinc.h
diff --git a/drivers/net/skfp/h/smc.h b/drivers/net/fddi/skfp/h/smc.h
similarity index 100%
rename from drivers/net/skfp/h/smc.h
rename to drivers/net/fddi/skfp/h/smc.h
diff --git a/drivers/net/skfp/h/smt.h b/drivers/net/fddi/skfp/h/smt.h
similarity index 100%
rename from drivers/net/skfp/h/smt.h
rename to drivers/net/fddi/skfp/h/smt.h
diff --git a/drivers/net/skfp/h/smt_p.h b/drivers/net/fddi/skfp/h/smt_p.h
similarity index 100%
rename from drivers/net/skfp/h/smt_p.h
rename to drivers/net/fddi/skfp/h/smt_p.h
diff --git a/drivers/net/skfp/h/smtstate.h b/drivers/net/fddi/skfp/h/smtstate.h
similarity index 100%
rename from drivers/net/skfp/h/smtstate.h
rename to drivers/net/fddi/skfp/h/smtstate.h
diff --git a/drivers/net/skfp/h/supern_2.h b/drivers/net/fddi/skfp/h/supern_2.h
similarity index 100%
rename from drivers/net/skfp/h/supern_2.h
rename to drivers/net/fddi/skfp/h/supern_2.h
diff --git a/drivers/net/skfp/h/targethw.h b/drivers/net/fddi/skfp/h/targethw.h
similarity index 100%
rename from drivers/net/skfp/h/targethw.h
rename to drivers/net/fddi/skfp/h/targethw.h
diff --git a/drivers/net/skfp/h/targetos.h b/drivers/net/fddi/skfp/h/targetos.h
similarity index 100%
rename from drivers/net/skfp/h/targetos.h
rename to drivers/net/fddi/skfp/h/targetos.h
diff --git a/drivers/net/skfp/h/types.h b/drivers/net/fddi/skfp/h/types.h
similarity index 100%
rename from drivers/net/skfp/h/types.h
rename to drivers/net/fddi/skfp/h/types.h
diff --git a/drivers/net/skfp/hwmtm.c b/drivers/net/fddi/skfp/hwmtm.c
similarity index 100%
rename from drivers/net/skfp/hwmtm.c
rename to drivers/net/fddi/skfp/hwmtm.c
diff --git a/drivers/net/skfp/hwt.c b/drivers/net/fddi/skfp/hwt.c
similarity index 100%
rename from drivers/net/skfp/hwt.c
rename to drivers/net/fddi/skfp/hwt.c
diff --git a/drivers/net/skfp/pcmplc.c b/drivers/net/fddi/skfp/pcmplc.c
similarity index 100%
rename from drivers/net/skfp/pcmplc.c
rename to drivers/net/fddi/skfp/pcmplc.c
diff --git a/drivers/net/skfp/pmf.c b/drivers/net/fddi/skfp/pmf.c
similarity index 100%
rename from drivers/net/skfp/pmf.c
rename to drivers/net/fddi/skfp/pmf.c
diff --git a/drivers/net/skfp/queue.c b/drivers/net/fddi/skfp/queue.c
similarity index 100%
rename from drivers/net/skfp/queue.c
rename to drivers/net/fddi/skfp/queue.c
diff --git a/drivers/net/skfp/rmt.c b/drivers/net/fddi/skfp/rmt.c
similarity index 100%
rename from drivers/net/skfp/rmt.c
rename to drivers/net/fddi/skfp/rmt.c
diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/fddi/skfp/skfddi.c
similarity index 100%
rename from drivers/net/skfp/skfddi.c
rename to drivers/net/fddi/skfp/skfddi.c
diff --git a/drivers/net/skfp/smt.c b/drivers/net/fddi/skfp/smt.c
similarity index 100%
rename from drivers/net/skfp/smt.c
rename to drivers/net/fddi/skfp/smt.c
diff --git a/drivers/net/skfp/smtdef.c b/drivers/net/fddi/skfp/smtdef.c
similarity index 100%
rename from drivers/net/skfp/smtdef.c
rename to drivers/net/fddi/skfp/smtdef.c
diff --git a/drivers/net/skfp/smtinit.c b/drivers/net/fddi/skfp/smtinit.c
similarity index 100%
rename from drivers/net/skfp/smtinit.c
rename to drivers/net/fddi/skfp/smtinit.c
diff --git a/drivers/net/skfp/smttimer.c b/drivers/net/fddi/skfp/smttimer.c
similarity index 100%
rename from drivers/net/skfp/smttimer.c
rename to drivers/net/fddi/skfp/smttimer.c
diff --git a/drivers/net/skfp/srf.c b/drivers/net/fddi/skfp/srf.c
similarity index 100%
rename from drivers/net/skfp/srf.c
rename to drivers/net/fddi/skfp/srf.c
--
1.7.6
^ permalink raw reply related
* [net-next 2/9] ppp: Move the PPP drivers
From: Jeff Kirsher @ 2011-08-24 4:39 UTC (permalink / raw)
To: davem
Cc: Jeff Kirsher, netdev, gospo, Paul Mackerras, Frank Cusack,
Michal Ostrowski, Michal Ostrowski, Dmitry Kozlov
In-Reply-To: <1314160774-6980-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the PPP drivers into drivers/net/ppp/ and make the
necessary Kconfig and Makefile changes.
CC: Paul Mackerras <paulus@samba.org>
CC: Frank Cusack <fcusack@fcusack.com>
CC: Michal Ostrowski <mostrows@speakeasy.net>
CC: Michal Ostrowski <mostrows@earthlink.net>
CC: Dmitry Kozlov <xeb@mail.ru>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 8 +-
drivers/net/Kconfig | 170 +---------------------------------
drivers/net/Makefile | 10 +--
drivers/net/ppp/Kconfig | 176 +++++++++++++++++++++++++++++++++++
drivers/net/ppp/Makefile | 13 +++
drivers/net/{ => ppp}/bsd_comp.c | 0
drivers/net/{ => ppp}/ppp_async.c | 0
drivers/net/{ => ppp}/ppp_deflate.c | 0
drivers/net/{ => ppp}/ppp_generic.c | 0
drivers/net/{ => ppp}/ppp_mppe.c | 0
drivers/net/{ => ppp}/ppp_mppe.h | 0
drivers/net/{ => ppp}/ppp_synctty.c | 0
drivers/net/{ => ppp}/pppoe.c | 0
drivers/net/{ => ppp}/pppox.c | 0
drivers/net/{ => ppp}/pptp.c | 0
15 files changed, 196 insertions(+), 181 deletions(-)
create mode 100644 drivers/net/ppp/Kconfig
create mode 100644 drivers/net/ppp/Makefile
rename drivers/net/{ => ppp}/bsd_comp.c (100%)
rename drivers/net/{ => ppp}/ppp_async.c (100%)
rename drivers/net/{ => ppp}/ppp_deflate.c (100%)
rename drivers/net/{ => ppp}/ppp_generic.c (100%)
rename drivers/net/{ => ppp}/ppp_mppe.c (100%)
rename drivers/net/{ => ppp}/ppp_mppe.h (100%)
rename drivers/net/{ => ppp}/ppp_synctty.c (100%)
rename drivers/net/{ => ppp}/pppoe.c (100%)
rename drivers/net/{ => ppp}/pppox.c (100%)
rename drivers/net/{ => ppp}/pptp.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 2777088..c5ec925 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5066,7 +5066,7 @@ PPP PROTOCOL DRIVERS AND COMPRESSORS
M: Paul Mackerras <paulus@samba.org>
L: linux-ppp@vger.kernel.org
S: Maintained
-F: drivers/net/ppp_*
+F: drivers/net/ppp/ppp_*
PPP OVER ATM (RFC 2364)
M: Mitchell Blank Jr <mitch@sfgoth.com>
@@ -5077,8 +5077,8 @@ F: include/linux/atmppp.h
PPP OVER ETHERNET
M: Michal Ostrowski <mostrows@earthlink.net>
S: Maintained
-F: drivers/net/pppoe.c
-F: drivers/net/pppox.c
+F: drivers/net/ppp/pppoe.c
+F: drivers/net/ppp/pppox.c
PPP OVER L2TP
M: James Chapman <jchapman@katalix.com>
@@ -5099,7 +5099,7 @@ PPTP DRIVER
M: Dmitry Kozlov <xeb@mail.ru>
L: netdev@vger.kernel.org
S: Maintained
-F: drivers/net/pptp.c
+F: drivers/net/ppp/pptp.c
W: http://sourceforge.net/projects/accel-pptp
PREEMPTIBLE KERNEL
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 7bdc22b..c5e2a38 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -207,6 +207,8 @@ source "drivers/net/usb/Kconfig"
source "drivers/net/pcmcia/Kconfig"
+source "drivers/net/ppp/Kconfig"
+
source "drivers/net/wan/Kconfig"
source "drivers/atm/Kconfig"
@@ -337,174 +339,6 @@ config PLIP
will be called plip. If unsure, say Y or M, in case you buy
a laptop later.
-config PPP
- tristate "PPP (point-to-point protocol) support"
- select SLHC
- ---help---
- PPP (Point to Point Protocol) is a newer and better SLIP. It serves
- the same purpose: sending Internet traffic over telephone (and other
- serial) lines. Ask your access provider if they support it, because
- otherwise you can't use it; most Internet access providers these
- days support PPP rather than SLIP.
-
- To use PPP, you need an additional program called pppd as described
- in the PPP-HOWTO, available at
- <http://www.tldp.org/docs.html#howto>. Make sure that you have
- the version of pppd recommended in <file:Documentation/Changes>.
- The PPP option enlarges your kernel by about 16 KB.
-
- There are actually two versions of PPP: the traditional PPP for
- asynchronous lines, such as regular analog phone lines, and
- synchronous PPP which can be used over digital ISDN lines for
- example. If you want to use PPP over phone lines or other
- asynchronous serial lines, you need to say Y (or M) here and also to
- the next option, "PPP support for async serial ports". For PPP over
- synchronous lines, you should say Y (or M) here and to "Support
- synchronous PPP", below.
-
- If you said Y to "Version information on all symbols" above, then
- you cannot compile the PPP driver into the kernel; you can then only
- compile it as a module. To compile this driver as a module, choose M
- here. The module will be called ppp_generic.
-
-config PPP_MULTILINK
- bool "PPP multilink support (EXPERIMENTAL)"
- depends on PPP && EXPERIMENTAL
- help
- PPP multilink is a protocol (defined in RFC 1990) which allows you
- to combine several (logical or physical) lines into one logical PPP
- connection, so that you can utilize your full bandwidth.
-
- This has to be supported at the other end as well and you need a
- version of the pppd daemon which understands the multilink protocol.
-
- If unsure, say N.
-
-config PPP_FILTER
- bool "PPP filtering"
- depends on PPP
- help
- Say Y here if you want to be able to filter the packets passing over
- PPP interfaces. This allows you to control which packets count as
- activity (i.e. which packets will reset the idle timer or bring up
- a demand-dialed link) and which packets are to be dropped entirely.
- You need to say Y here if you wish to use the pass-filter and
- active-filter options to pppd.
-
- If unsure, say N.
-
-config PPP_ASYNC
- tristate "PPP support for async serial ports"
- depends on PPP
- select CRC_CCITT
- ---help---
- Say Y (or M) here if you want to be able to use PPP over standard
- asynchronous serial ports, such as COM1 or COM2 on a PC. If you use
- a modem (not a synchronous or ISDN modem) to contact your ISP, you
- need this option.
-
- To compile this driver as a module, choose M here.
-
- If unsure, say Y.
-
-config PPP_SYNC_TTY
- tristate "PPP support for sync tty ports"
- depends on PPP
- help
- Say Y (or M) here if you want to be able to use PPP over synchronous
- (HDLC) tty devices, such as the SyncLink adapter. These devices
- are often used for high-speed leased lines like T1/E1.
-
- To compile this driver as a module, choose M here.
-
-config PPP_DEFLATE
- tristate "PPP Deflate compression"
- depends on PPP
- select ZLIB_INFLATE
- select ZLIB_DEFLATE
- ---help---
- Support for the Deflate compression method for PPP, which uses the
- Deflate algorithm (the same algorithm that gzip uses) to compress
- each PPP packet before it is sent over the wire. The machine at the
- other end of the PPP link (usually your ISP) has to support the
- Deflate compression method as well for this to be useful. Even if
- they don't support it, it is safe to say Y here.
-
- To compile this driver as a module, choose M here.
-
-config PPP_BSDCOMP
- tristate "PPP BSD-Compress compression"
- depends on PPP
- ---help---
- Support for the BSD-Compress compression method for PPP, which uses
- the LZW compression method to compress each PPP packet before it is
- sent over the wire. The machine at the other end of the PPP link
- (usually your ISP) has to support the BSD-Compress compression
- method as well for this to be useful. Even if they don't support it,
- it is safe to say Y here.
-
- The PPP Deflate compression method ("PPP Deflate compression",
- above) is preferable to BSD-Compress, because it compresses better
- and is patent-free.
-
- Note that the BSD compression code will always be compiled as a
- module; it is called bsd_comp and will show up in the directory
- modules once you have said "make modules". If unsure, say N.
-
-config PPP_MPPE
- tristate "PPP MPPE compression (encryption) (EXPERIMENTAL)"
- depends on PPP && EXPERIMENTAL
- select CRYPTO
- select CRYPTO_SHA1
- select CRYPTO_ARC4
- select CRYPTO_ECB
- ---help---
- Support for the MPPE Encryption protocol, as employed by the
- Microsoft Point-to-Point Tunneling Protocol.
-
- See http://pptpclient.sourceforge.net/ for information on
- configuring PPTP clients and servers to utilize this method.
-
-config PPPOE
- tristate "PPP over Ethernet (EXPERIMENTAL)"
- depends on EXPERIMENTAL && PPP
- help
- Support for PPP over Ethernet.
-
- This driver requires the latest version of pppd from the CVS
- repository at cvs.samba.org. Alternatively, see the
- RoaringPenguin package (<http://www.roaringpenguin.com/pppoe>)
- which contains instruction on how to use this driver (under
- the heading "Kernel mode PPPoE").
-
-config PPTP
- tristate "PPP over IPv4 (PPTP) (EXPERIMENTAL)"
- depends on EXPERIMENTAL && PPP && NET_IPGRE_DEMUX
- help
- Support for PPP over IPv4.(Point-to-Point Tunneling Protocol)
-
- This driver requires pppd plugin to work in client mode or
- modified pptpd (poptop) to work in server mode.
- See http://accel-pptp.sourceforge.net/ for information how to
- utilize this module.
-
-config PPPOATM
- tristate "PPP over ATM"
- depends on ATM && PPP
- help
- Support PPP (Point to Point Protocol) encapsulated in ATM frames.
- This implementation does not yet comply with section 8 of RFC2364,
- which can lead to bad results if the ATM peer loses state and
- changes its encapsulation unilaterally.
-
-config PPPOL2TP
- tristate "PPP over L2TP (EXPERIMENTAL)"
- depends on EXPERIMENTAL && L2TP && PPP
- help
- Support for PPP-over-L2TP socket family. L2TP is a protocol
- used by ISPs and enterprises to tunnel PPP traffic over UDP
- tunnels. L2TP is replacing PPTP for VPN uses.
-
config SLIP
tristate "SLIP (serial line) support"
---help---
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 3087b27..9ce7c70 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -22,15 +22,6 @@ obj-$(CONFIG_RIONET) += rionet.o
obj-$(CONFIG_NET) += Space.o loopback.o
obj-$(CONFIG_NET_SB1000) += sb1000.o
-obj-$(CONFIG_PPP) += ppp_generic.o
-obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
-obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o
-obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate.o
-obj-$(CONFIG_PPP_BSDCOMP) += bsd_comp.o
-obj-$(CONFIG_PPP_MPPE) += ppp_mppe.o
-obj-$(CONFIG_PPPOE) += pppox.o pppoe.o
-obj-$(CONFIG_PPPOL2TP) += pppox.o
-obj-$(CONFIG_PPTP) += pppox.o pptp.o
obj-$(CONFIG_SLIP) += slip.o
obj-$(CONFIG_SLHC) += slhc.o
@@ -48,6 +39,7 @@ obj-$(CONFIG_VETH) += veth.o
obj-$(CONFIG_DEV_APPLETALK) += appletalk/
obj-$(CONFIG_ETHERNET) += ethernet/
obj-$(CONFIG_FDDI) += fddi/
+onj-$(CONFIG_PPP) += ppp/
obj-$(CONFIG_TR) += tokenring/
obj-$(CONFIG_WAN) += wan/
obj-$(CONFIG_ARCNET) += arcnet/
diff --git a/drivers/net/ppp/Kconfig b/drivers/net/ppp/Kconfig
new file mode 100644
index 0000000..bc60a40
--- /dev/null
+++ b/drivers/net/ppp/Kconfig
@@ -0,0 +1,176 @@
+#
+# PPP network device configuration
+#
+
+config PPP
+ tristate "PPP (point-to-point protocol) support"
+ depends on PCI || EISA || TC
+ select SLHC
+ ---help---
+ PPP (Point to Point Protocol) is a newer and better SLIP. It serves
+ the same purpose: sending Internet traffic over telephone (and other
+ serial) lines. Ask your access provider if they support it, because
+ otherwise you can't use it; most Internet access providers these
+ days support PPP rather than SLIP.
+
+ To use PPP, you need an additional program called pppd as described
+ in the PPP-HOWTO, available at
+ <http://www.tldp.org/docs.html#howto>. Make sure that you have
+ the version of pppd recommended in <file:Documentation/Changes>.
+ The PPP option enlarges your kernel by about 16 KB.
+
+ There are actually two versions of PPP: the traditional PPP for
+ asynchronous lines, such as regular analog phone lines, and
+ synchronous PPP which can be used over digital ISDN lines for
+ example. If you want to use PPP over phone lines or other
+ asynchronous serial lines, you need to say Y (or M) here and also to
+ the next option, "PPP support for async serial ports". For PPP over
+ synchronous lines, you should say Y (or M) here and to "Support
+ synchronous PPP", below.
+
+ If you said Y to "Version information on all symbols" above, then
+ you cannot compile the PPP driver into the kernel; you can then only
+ compile it as a module. To compile this driver as a module, choose M
+ here. The module will be called ppp_generic.
+
+if PPP
+
+config PPP_BSDCOMP
+ tristate "PPP BSD-Compress compression"
+ depends on PPP
+ ---help---
+ Support for the BSD-Compress compression method for PPP, which uses
+ the LZW compression method to compress each PPP packet before it is
+ sent over the wire. The machine at the other end of the PPP link
+ (usually your ISP) has to support the BSD-Compress compression
+ method as well for this to be useful. Even if they don't support it,
+ it is safe to say Y here.
+
+ The PPP Deflate compression method ("PPP Deflate compression",
+ above) is preferable to BSD-Compress, because it compresses better
+ and is patent-free.
+
+ Note that the BSD compression code will always be compiled as a
+ module; it is called bsd_comp and will show up in the directory
+ modules once you have said "make modules". If unsure, say N.
+
+config PPP_DEFLATE
+ tristate "PPP Deflate compression"
+ depends on PPP
+ select ZLIB_INFLATE
+ select ZLIB_DEFLATE
+ ---help---
+ Support for the Deflate compression method for PPP, which uses the
+ Deflate algorithm (the same algorithm that gzip uses) to compress
+ each PPP packet before it is sent over the wire. The machine at the
+ other end of the PPP link (usually your ISP) has to support the
+ Deflate compression method as well for this to be useful. Even if
+ they don't support it, it is safe to say Y here.
+
+ To compile this driver as a module, choose M here.
+
+config PPP_FILTER
+ bool "PPP filtering"
+ depends on PPP
+ ---help---
+ Say Y here if you want to be able to filter the packets passing over
+ PPP interfaces. This allows you to control which packets count as
+ activity (i.e. which packets will reset the idle timer or bring up
+ a demand-dialed link) and which packets are to be dropped entirely.
+ You need to say Y here if you wish to use the pass-filter and
+ active-filter options to pppd.
+
+ If unsure, say N.
+
+config PPP_MPPE
+ tristate "PPP MPPE compression (encryption) (EXPERIMENTAL)"
+ depends on PPP && EXPERIMENTAL
+ select CRYPTO
+ select CRYPTO_SHA1
+ select CRYPTO_ARC4
+ select CRYPTO_ECB
+ ---help---
+ Support for the MPPE Encryption protocol, as employed by the
+ Microsoft Point-to-Point Tunneling Protocol.
+
+ See http://pptpclient.sourceforge.net/ for information on
+ configuring PPTP clients and servers to utilize this method.
+
+config PPP_MULTILINK
+ bool "PPP multilink support (EXPERIMENTAL)"
+ depends on PPP && EXPERIMENTAL
+ ---help---
+ PPP multilink is a protocol (defined in RFC 1990) which allows you
+ to combine several (logical or physical) lines into one logical PPP
+ connection, so that you can utilize your full bandwidth.
+
+ This has to be supported at the other end as well and you need a
+ version of the pppd daemon which understands the multilink protocol.
+
+ If unsure, say N.
+
+config PPPOATM
+ tristate "PPP over ATM"
+ depends on ATM && PPP
+ ---help---
+ Support PPP (Point to Point Protocol) encapsulated in ATM frames.
+ This implementation does not yet comply with section 8 of RFC2364,
+ which can lead to bad results if the ATM peer loses state and
+ changes its encapsulation unilaterally.
+
+config PPPOE
+ tristate "PPP over Ethernet (EXPERIMENTAL)"
+ depends on EXPERIMENTAL && PPP
+ ---help---
+ Support for PPP over Ethernet.
+
+ This driver requires the latest version of pppd from the CVS
+ repository at cvs.samba.org. Alternatively, see the
+ RoaringPenguin package (<http://www.roaringpenguin.com/pppoe>)
+ which contains instruction on how to use this driver (under
+ the heading "Kernel mode PPPoE").
+
+config PPTP
+ tristate "PPP over IPv4 (PPTP) (EXPERIMENTAL)"
+ depends on EXPERIMENTAL && PPP && NET_IPGRE_DEMUX
+ ---help---
+ Support for PPP over IPv4.(Point-to-Point Tunneling Protocol)
+
+ This driver requires pppd plugin to work in client mode or
+ modified pptpd (poptop) to work in server mode.
+ See http://accel-pptp.sourceforge.net/ for information how to
+ utilize this module.
+
+config PPPOL2TP
+ tristate "PPP over L2TP (EXPERIMENTAL)"
+ depends on EXPERIMENTAL && L2TP && PPP
+ ---help---
+ Support for PPP-over-L2TP socket family. L2TP is a protocol
+ used by ISPs and enterprises to tunnel PPP traffic over UDP
+ tunnels. L2TP is replacing PPTP for VPN uses.
+
+config PPP_ASYNC
+ tristate "PPP support for async serial ports"
+ depends on PPP
+ select CRC_CCITT
+ ---help---
+ Say Y (or M) here if you want to be able to use PPP over standard
+ asynchronous serial ports, such as COM1 or COM2 on a PC. If you use
+ a modem (not a synchronous or ISDN modem) to contact your ISP, you
+ need this option.
+
+ To compile this driver as a module, choose M here.
+
+ If unsure, say Y.
+
+config PPP_SYNC_TTY
+ tristate "PPP support for sync tty ports"
+ depends on PPP
+ ---help---
+ Say Y (or M) here if you want to be able to use PPP over synchronous
+ (HDLC) tty devices, such as the SyncLink adapter. These devices
+ are often used for high-speed leased lines like T1/E1.
+
+ To compile this driver as a module, choose M here.
+
+endif # PPP
diff --git a/drivers/net/ppp/Makefile b/drivers/net/ppp/Makefile
new file mode 100644
index 0000000..a6b6297
--- /dev/null
+++ b/drivers/net/ppp/Makefile
@@ -0,0 +1,13 @@
+#
+# Makefile for the Linux PPP network device drivers.
+#
+
+obj-$(CONFIG_PPP) += ppp_generic.o
+obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
+obj-$(CONFIG_PPP_BSDCOMP) += bsd_comp.o
+obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate.o
+obj-$(CONFIG_PPP_MPPE) += ppp_mppe.o
+obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o
+obj-$(CONFIG_PPPOE) += pppox.o pppoe.o
+obj-$(CONFIG_PPPOL2TP) += pppox.o
+obj-$(CONFIG_PPTP) += pppox.o pptp.o
diff --git a/drivers/net/bsd_comp.c b/drivers/net/ppp/bsd_comp.c
similarity index 100%
rename from drivers/net/bsd_comp.c
rename to drivers/net/ppp/bsd_comp.c
diff --git a/drivers/net/ppp_async.c b/drivers/net/ppp/ppp_async.c
similarity index 100%
rename from drivers/net/ppp_async.c
rename to drivers/net/ppp/ppp_async.c
diff --git a/drivers/net/ppp_deflate.c b/drivers/net/ppp/ppp_deflate.c
similarity index 100%
rename from drivers/net/ppp_deflate.c
rename to drivers/net/ppp/ppp_deflate.c
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
similarity index 100%
rename from drivers/net/ppp_generic.c
rename to drivers/net/ppp/ppp_generic.c
diff --git a/drivers/net/ppp_mppe.c b/drivers/net/ppp/ppp_mppe.c
similarity index 100%
rename from drivers/net/ppp_mppe.c
rename to drivers/net/ppp/ppp_mppe.c
diff --git a/drivers/net/ppp_mppe.h b/drivers/net/ppp/ppp_mppe.h
similarity index 100%
rename from drivers/net/ppp_mppe.h
rename to drivers/net/ppp/ppp_mppe.h
diff --git a/drivers/net/ppp_synctty.c b/drivers/net/ppp/ppp_synctty.c
similarity index 100%
rename from drivers/net/ppp_synctty.c
rename to drivers/net/ppp/ppp_synctty.c
diff --git a/drivers/net/pppoe.c b/drivers/net/ppp/pppoe.c
similarity index 100%
rename from drivers/net/pppoe.c
rename to drivers/net/ppp/pppoe.c
diff --git a/drivers/net/pppox.c b/drivers/net/ppp/pppox.c
similarity index 100%
rename from drivers/net/pppox.c
rename to drivers/net/ppp/pppox.c
diff --git a/drivers/net/pptp.c b/drivers/net/ppp/pptp.c
similarity index 100%
rename from drivers/net/pptp.c
rename to drivers/net/ppp/pptp.c
--
1.7.6
^ permalink raw reply related
* [net-next 4/9] plip: Move the PLIP driver
From: Jeff Kirsher @ 2011-08-24 4:39 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, Niibe Yutaka
In-Reply-To: <1314160774-6980-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the Parallel Line Internet Protocol (PLIP) driver into
drivers/net/plip/ and make the necessary Kconfig and Makefile changes.
CC: Niibe Yutaka <gniibe@mri.co.jp>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: Alan Cox <alan@linux.intel.com>
---
drivers/net/Kconfig | 37 ++-----------------------------------
drivers/net/Makefile | 2 +-
drivers/net/plip/Kconfig | 38 ++++++++++++++++++++++++++++++++++++++
drivers/net/plip/Makefile | 5 +++++
drivers/net/{ => plip}/plip.c | 0
5 files changed, 46 insertions(+), 36 deletions(-)
create mode 100644 drivers/net/plip/Kconfig
create mode 100644 drivers/net/plip/Makefile
rename drivers/net/{ => plip}/plip.c (100%)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 1d8fa95..3f72686 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -197,6 +197,8 @@ source "drivers/net/ethernet/Kconfig"
source "drivers/net/fddi/Kconfig"
+source "drivers/net/plip/Kconfig"
+
source "drivers/net/tokenring/Kconfig"
source "drivers/net/wireless/Kconfig"
@@ -272,41 +274,6 @@ config RIONET_RX_SIZE
depends on RIONET
default "128"
-config PLIP
- tristate "PLIP (parallel port) support"
- depends on PARPORT
- ---help---
- PLIP (Parallel Line Internet Protocol) is used to create a
- reasonably fast mini network consisting of two (or, rarely, more)
- local machines. A PLIP link from a Linux box is a popular means to
- install a Linux distribution on a machine which doesn't have a
- CD-ROM drive (a minimal system has to be transferred with floppies
- first). The kernels on both machines need to have this PLIP option
- enabled for this to work.
-
- The PLIP driver has two modes, mode 0 and mode 1. The parallel
- ports (the connectors at the computers with 25 holes) are connected
- with "null printer" or "Turbo Laplink" cables which can transmit 4
- bits at a time (mode 0) or with special PLIP cables, to be used on
- bidirectional parallel ports only, which can transmit 8 bits at a
- time (mode 1); you can find the wiring of these cables in
- <file:Documentation/networking/PLIP.txt>. The cables can be up to
- 15m long. Mode 0 works also if one of the machines runs DOS/Windows
- and has some PLIP software installed, e.g. the Crynwr PLIP packet
- driver (<http://oak.oakland.edu/simtel.net/msdos/pktdrvr-pre.html>)
- and winsock or NCSA's telnet.
-
- If you want to use PLIP, say Y and read the PLIP mini-HOWTO as well
- as the NET-3-HOWTO, both available from
- <http://www.tldp.org/docs.html#howto>. Note that the PLIP
- protocol has been changed and this PLIP driver won't work together
- with the PLIP support in Linux versions 1.0.x. This option enlarges
- your kernel by about 8 KB.
-
- To compile this driver as a module, choose M here. The module
- will be called plip. If unsure, say Y or M, in case you buy
- a laptop later.
-
config SLIP
tristate "SLIP (serial line) support"
---help---
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index aff07bd..7013815 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -12,7 +12,6 @@ obj-$(CONFIG_VMXNET3) += vmxnet3/
#
# link order important here
#
-obj-$(CONFIG_PLIP) += plip.o
obj-$(CONFIG_RIONET) += rionet.o
#
@@ -39,6 +38,7 @@ obj-$(CONFIG_DEV_APPLETALK) += appletalk/
obj-$(CONFIG_ETHERNET) += ethernet/
obj-$(CONFIG_FDDI) += fddi/
obj-$(CONFIG_HIPPI) += hippi/
+obj-$(CONFIG_PLIP) += plip/
onj-$(CONFIG_PPP) += ppp/
obj-$(CONFIG_TR) += tokenring/
obj-$(CONFIG_WAN) += wan/
diff --git a/drivers/net/plip/Kconfig b/drivers/net/plip/Kconfig
new file mode 100644
index 0000000..80c4a33
--- /dev/null
+++ b/drivers/net/plip/Kconfig
@@ -0,0 +1,38 @@
+#
+# Parallel Line Internet Protocol (PLIP) network device configuration
+#
+
+config PLIP
+ tristate "PLIP (parallel port) support"
+ depends on PARPORT
+ ---help---
+ PLIP (Parallel Line Internet Protocol) is used to create a
+ reasonably fast mini network consisting of two (or, rarely, more)
+ local machines. A PLIP link from a Linux box is a popular means to
+ install a Linux distribution on a machine which doesn't have a
+ CD-ROM drive (a minimal system has to be transferred with floppies
+ first). The kernels on both machines need to have this PLIP option
+ enabled for this to work.
+
+ The PLIP driver has two modes, mode 0 and mode 1. The parallel
+ ports (the connectors at the computers with 25 holes) are connected
+ with "null printer" or "Turbo Laplink" cables which can transmit 4
+ bits at a time (mode 0) or with special PLIP cables, to be used on
+ bidirectional parallel ports only, which can transmit 8 bits at a
+ time (mode 1); you can find the wiring of these cables in
+ <file:Documentation/networking/PLIP.txt>. The cables can be up to
+ 15m long. Mode 0 works also if one of the machines runs DOS/Windows
+ and has some PLIP software installed, e.g. the Crynwr PLIP packet
+ driver (<http://oak.oakland.edu/simtel.net/msdos/pktdrvr-pre.html>)
+ and winsock or NCSA's telnet.
+
+ If you want to use PLIP, say Y and read the PLIP mini-HOWTO as well
+ as the NET-3-HOWTO, both available from
+ <http://www.tldp.org/docs.html#howto>. Note that the PLIP
+ protocol has been changed and this PLIP driver won't work together
+ with the PLIP support in Linux versions 1.0.x. This option enlarges
+ your kernel by about 8 KB.
+
+ To compile this driver as a module, choose M here. The module
+ will be called plip. If unsure, say Y or M, in case you buy
+ a laptop later.
diff --git a/drivers/net/plip/Makefile b/drivers/net/plip/Makefile
new file mode 100644
index 0000000..ed95879
--- /dev/null
+++ b/drivers/net/plip/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the PLIP network device drivers.
+#
+
+obj-$(CONFIG_PLIP) += plip.o
diff --git a/drivers/net/plip.c b/drivers/net/plip/plip.c
similarity index 100%
rename from drivers/net/plip.c
rename to drivers/net/plip/plip.c
--
1.7.6
^ permalink raw reply related
* [net-next 3/9] hippi: Move the HIPPI driver
From: Jeff Kirsher @ 2011-08-24 4:39 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, Jes Sorensen, Jes Sorensen
In-Reply-To: <1314160774-6980-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the HIPPI driver into drivers/net/hippi/ and make the
necessary Kconfig and Makefile changes.
CC: Jes Sorensen <jes@wildopensource.com>
CC: Jes Sorensen <jes@trained-monkey.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 1 +
drivers/net/Kconfig | 32 ------------------------------
drivers/net/Makefile | 2 +-
drivers/net/hippi/Kconfig | 39 +++++++++++++++++++++++++++++++++++++
drivers/net/hippi/Makefile | 5 ++++
drivers/net/{ => hippi}/rrunner.c | 0
drivers/net/{ => hippi}/rrunner.h | 0
7 files changed, 46 insertions(+), 33 deletions(-)
create mode 100644 drivers/net/hippi/Kconfig
create mode 100644 drivers/net/hippi/Makefile
rename drivers/net/{ => hippi}/rrunner.c (100%)
rename drivers/net/{ => hippi}/rrunner.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index c5ec925..194095a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3049,6 +3049,7 @@ S: Maintained
F: include/linux/hippidevice.h
F: include/linux/if_hippi.h
F: net/802/hippi.c
+F: drivers/net/hippi/
HOST AP DRIVER
M: Jouni Malinen <j@w1.fi>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index c5e2a38..1d8fa95 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -272,38 +272,6 @@ config RIONET_RX_SIZE
depends on RIONET
default "128"
-config HIPPI
- bool "HIPPI driver support (EXPERIMENTAL)"
- depends on EXPERIMENTAL && INET && PCI
- help
- HIgh Performance Parallel Interface (HIPPI) is a 800Mbit/sec and
- 1600Mbit/sec dual-simplex switched or point-to-point network. HIPPI
- can run over copper (25m) or fiber (300m on multi-mode or 10km on
- single-mode). HIPPI networks are commonly used for clusters and to
- connect to super computers. If you are connected to a HIPPI network
- and have a HIPPI network card in your computer that you want to use
- under Linux, say Y here (you must also remember to enable the driver
- for your HIPPI card below). Most people will say N here.
-
-config ROADRUNNER
- tristate "Essential RoadRunner HIPPI PCI adapter support (EXPERIMENTAL)"
- depends on HIPPI && PCI
- help
- Say Y here if this is your PCI HIPPI network card.
-
- To compile this driver as a module, choose M here: the module
- will be called rrunner. If unsure, say N.
-
-config ROADRUNNER_LARGE_RINGS
- bool "Use large TX/RX rings (EXPERIMENTAL)"
- depends on ROADRUNNER
- help
- If you say Y here, the RoadRunner driver will preallocate up to 2 MB
- of additional memory to allow for fastest operation, both for
- transmitting and receiving. This memory cannot be used by any other
- kernel code or by user space programs. Say Y here only if you have
- the memory.
-
config PLIP
tristate "PLIP (parallel port) support"
depends on PARPORT
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 9ce7c70..aff07bd 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -13,7 +13,6 @@ obj-$(CONFIG_VMXNET3) += vmxnet3/
# link order important here
#
obj-$(CONFIG_PLIP) += plip.o
-obj-$(CONFIG_ROADRUNNER) += rrunner.o
obj-$(CONFIG_RIONET) += rionet.o
#
@@ -39,6 +38,7 @@ obj-$(CONFIG_VETH) += veth.o
obj-$(CONFIG_DEV_APPLETALK) += appletalk/
obj-$(CONFIG_ETHERNET) += ethernet/
obj-$(CONFIG_FDDI) += fddi/
+obj-$(CONFIG_HIPPI) += hippi/
onj-$(CONFIG_PPP) += ppp/
obj-$(CONFIG_TR) += tokenring/
obj-$(CONFIG_WAN) += wan/
diff --git a/drivers/net/hippi/Kconfig b/drivers/net/hippi/Kconfig
new file mode 100644
index 0000000..7393eb7
--- /dev/null
+++ b/drivers/net/hippi/Kconfig
@@ -0,0 +1,39 @@
+#
+# HIPPI network device configuration
+#
+
+config HIPPI
+ bool "HIPPI driver support (EXPERIMENTAL)"
+ depends on EXPERIMENTAL && INET && PCI
+ ---help---
+ HIgh Performance Parallel Interface (HIPPI) is a 800Mbit/sec and
+ 1600Mbit/sec dual-simplex switched or point-to-point network. HIPPI
+ can run over copper (25m) or fiber (300m on multi-mode or 10km on
+ single-mode). HIPPI networks are commonly used for clusters and to
+ connect to super computers. If you are connected to a HIPPI network
+ and have a HIPPI network card in your computer that you want to use
+ under Linux, say Y here (you must also remember to enable the driver
+ for your HIPPI card below). Most people will say N here.
+
+if HIPPI
+
+config ROADRUNNER
+ tristate "Essential RoadRunner HIPPI PCI adapter support (EXPERIMENTAL)"
+ depends on PCI
+ ---help---
+ Say Y here if this is your PCI HIPPI network card.
+
+ To compile this driver as a module, choose M here: the module
+ will be called rrunner. If unsure, say N.
+
+config ROADRUNNER_LARGE_RINGS
+ bool "Use large TX/RX rings (EXPERIMENTAL)"
+ depends on ROADRUNNER
+ ---help---
+ If you say Y here, the RoadRunner driver will preallocate up to 2 MB
+ of additional memory to allow for fastest operation, both for
+ transmitting and receiving. This memory cannot be used by any other
+ kernel code or by user space programs. Say Y here only if you have
+ the memory.
+
+endif /* HIPPI */
diff --git a/drivers/net/hippi/Makefile b/drivers/net/hippi/Makefile
new file mode 100644
index 0000000..b95d629
--- /dev/null
+++ b/drivers/net/hippi/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the HIPPI network device drivers.
+#
+
+obj-$(CONFIG_ROADRUNNER) += rrunner.o
diff --git a/drivers/net/rrunner.c b/drivers/net/hippi/rrunner.c
similarity index 100%
rename from drivers/net/rrunner.c
rename to drivers/net/hippi/rrunner.c
diff --git a/drivers/net/rrunner.h b/drivers/net/hippi/rrunner.h
similarity index 100%
rename from drivers/net/rrunner.h
rename to drivers/net/hippi/rrunner.h
--
1.7.6
^ permalink raw reply related
* [net-next 5/9] slip: Move the SLIP drivers
From: Jeff Kirsher @ 2011-08-24 4:39 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo
In-Reply-To: <1314160774-6980-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the Serial Line Internet Protocol (SLIP) drivers into
drivers/net/slip/ and make the necessary Kconfig and Makefile
changes.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: Alan Cox <alan@linux.intel.com>
---
drivers/net/Kconfig | 74 +-------------------------------------
drivers/net/Makefile | 3 +-
drivers/net/slip/Kconfig | 79 +++++++++++++++++++++++++++++++++++++++++
drivers/net/slip/Makefile | 6 +++
drivers/net/{ => slip}/slhc.c | 0
drivers/net/{ => slip}/slip.c | 0
drivers/net/{ => slip}/slip.h | 0
7 files changed, 88 insertions(+), 74 deletions(-)
create mode 100644 drivers/net/slip/Kconfig
create mode 100644 drivers/net/slip/Makefile
rename drivers/net/{ => slip}/slhc.c (100%)
rename drivers/net/{ => slip}/slip.c (100%)
rename drivers/net/{ => slip}/slip.h (100%)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 3f72686..b3206c9 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -199,6 +199,8 @@ source "drivers/net/fddi/Kconfig"
source "drivers/net/plip/Kconfig"
+source "drivers/net/slip/Kconfig"
+
source "drivers/net/tokenring/Kconfig"
source "drivers/net/wireless/Kconfig"
@@ -274,78 +276,6 @@ config RIONET_RX_SIZE
depends on RIONET
default "128"
-config SLIP
- tristate "SLIP (serial line) support"
- ---help---
- Say Y if you intend to use SLIP or CSLIP (compressed SLIP) to
- connect to your Internet service provider or to connect to some
- other local Unix box or if you want to configure your Linux box as a
- Slip/CSlip server for other people to dial in. SLIP (Serial Line
- Internet Protocol) is a protocol used to send Internet traffic over
- serial connections such as telephone lines or null modem cables;
- nowadays, the protocol PPP is more commonly used for this same
- purpose.
-
- Normally, your access provider has to support SLIP in order for you
- to be able to use it, but there is now a SLIP emulator called SLiRP
- around (available from
- <ftp://ibiblio.org/pub/Linux/system/network/serial/>) which
- allows you to use SLIP over a regular dial up shell connection. If
- you plan to use SLiRP, make sure to say Y to CSLIP, below. The
- NET-3-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>, explains how to
- configure SLIP. Note that you don't need this option if you just
- want to run term (term is a program which gives you almost full
- Internet connectivity if you have a regular dial up shell account on
- some Internet connected Unix computer. Read
- <http://www.bart.nl/~patrickr/term-howto/Term-HOWTO.html>). SLIP
- support will enlarge your kernel by about 4 KB. If unsure, say N.
-
- To compile this driver as a module, choose M here. The module
- will be called slip.
-
-config SLIP_COMPRESSED
- bool "CSLIP compressed headers"
- depends on SLIP
- select SLHC
- ---help---
- This protocol is faster than SLIP because it uses compression on the
- TCP/IP headers (not on the data itself), but it has to be supported
- on both ends. Ask your access provider if you are not sure and
- answer Y, just in case. You will still be able to use plain SLIP. If
- you plan to use SLiRP, the SLIP emulator (available from
- <ftp://ibiblio.org/pub/Linux/system/network/serial/>) which
- allows you to use SLIP over a regular dial up shell connection, you
- definitely want to say Y here. The NET-3-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>, explains how to configure
- CSLIP. This won't enlarge your kernel.
-
-config SLHC
- tristate
- help
- This option enables Van Jacobsen serial line header compression
- routines.
-
-config SLIP_SMART
- bool "Keepalive and linefill"
- depends on SLIP
- help
- Adds additional capabilities to the SLIP driver to support the
- RELCOM line fill and keepalive monitoring. Ideal on poor quality
- analogue lines.
-
-config SLIP_MODE_SLIP6
- bool "Six bit SLIP encapsulation"
- depends on SLIP
- help
- Just occasionally you may need to run IP over hostile serial
- networks that don't pass all control characters or are only seven
- bit. Saying Y here adds an extra mode you can use with SLIP:
- "slip6". In this mode, SLIP will only send normal ASCII symbols over
- the serial device. Naturally, this has to be supported at the other
- end of the link as well. It's good enough, for example, to run IP
- over the async ports of a Camtec JNT Pad. If unsure, say N.
-
config NET_FC
bool "Fibre Channel driver support"
depends on SCSI && PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 7013815..23ea83c 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -20,8 +20,6 @@ obj-$(CONFIG_RIONET) += rionet.o
obj-$(CONFIG_NET) += Space.o loopback.o
obj-$(CONFIG_NET_SB1000) += sb1000.o
-obj-$(CONFIG_SLIP) += slip.o
-obj-$(CONFIG_SLHC) += slhc.o
obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
obj-$(CONFIG_XEN_NETDEV_BACKEND) += xen-netback/
@@ -40,6 +38,7 @@ obj-$(CONFIG_FDDI) += fddi/
obj-$(CONFIG_HIPPI) += hippi/
obj-$(CONFIG_PLIP) += plip/
onj-$(CONFIG_PPP) += ppp/
+onj-$(CONFIG_SLIP) += slip/
obj-$(CONFIG_TR) += tokenring/
obj-$(CONFIG_WAN) += wan/
obj-$(CONFIG_ARCNET) += arcnet/
diff --git a/drivers/net/slip/Kconfig b/drivers/net/slip/Kconfig
new file mode 100644
index 0000000..9997ae0
--- /dev/null
+++ b/drivers/net/slip/Kconfig
@@ -0,0 +1,79 @@
+#
+# SLIP network device configuration
+#
+
+config SLIP
+ tristate "SLIP (serial line) support"
+ ---help---
+ Say Y if you intend to use SLIP or CSLIP (compressed SLIP) to
+ connect to your Internet service provider or to connect to some
+ other local Unix box or if you want to configure your Linux box as a
+ Slip/CSlip server for other people to dial in. SLIP (Serial Line
+ Internet Protocol) is a protocol used to send Internet traffic over
+ serial connections such as telephone lines or null modem cables;
+ nowadays, the protocol PPP is more commonly used for this same
+ purpose.
+
+ Normally, your access provider has to support SLIP in order for you
+ to be able to use it, but there is now a SLIP emulator called SLiRP
+ around (available from
+ <ftp://ibiblio.org/pub/Linux/system/network/serial/>) which
+ allows you to use SLIP over a regular dial up shell connection. If
+ you plan to use SLiRP, make sure to say Y to CSLIP, below. The
+ NET-3-HOWTO, available from
+ <http://www.tldp.org/docs.html#howto>, explains how to
+ configure SLIP. Note that you don't need this option if you just
+ want to run term (term is a program which gives you almost full
+ Internet connectivity if you have a regular dial up shell account on
+ some Internet connected Unix computer. Read
+ <http://www.bart.nl/~patrickr/term-howto/Term-HOWTO.html>). SLIP
+ support will enlarge your kernel by about 4 KB. If unsure, say N.
+
+ To compile this driver as a module, choose M here. The module
+ will be called slip.
+
+if SLIP
+
+config SLIP_COMPRESSED
+ bool "CSLIP compressed headers"
+ depends on SLIP
+ select SLHC
+ ---help---
+ This protocol is faster than SLIP because it uses compression on the
+ TCP/IP headers (not on the data itself), but it has to be supported
+ on both ends. Ask your access provider if you are not sure and
+ answer Y, just in case. You will still be able to use plain SLIP. If
+ you plan to use SLiRP, the SLIP emulator (available from
+ <ftp://ibiblio.org/pub/Linux/system/network/serial/>) which
+ allows you to use SLIP over a regular dial up shell connection, you
+ definitely want to say Y here. The NET-3-HOWTO, available from
+ <http://www.tldp.org/docs.html#howto>, explains how to configure
+ CSLIP. This won't enlarge your kernel.
+
+config SLHC
+ tristate
+ ---help---
+ This option enables Van Jacobsen serial line header compression
+ routines.
+
+config SLIP_SMART
+ bool "Keepalive and linefill"
+ depends on SLIP
+ ---help---
+ Adds additional capabilities to the SLIP driver to support the
+ RELCOM line fill and keepalive monitoring. Ideal on poor quality
+ analogue lines.
+
+config SLIP_MODE_SLIP6
+ bool "Six bit SLIP encapsulation"
+ depends on SLIP
+ ---help---
+ Just occasionally you may need to run IP over hostile serial
+ networks that don't pass all control characters or are only seven
+ bit. Saying Y here adds an extra mode you can use with SLIP:
+ "slip6". In this mode, SLIP will only send normal ASCII symbols over
+ the serial device. Naturally, this has to be supported at the other
+ end of the link as well. It's good enough, for example, to run IP
+ over the async ports of a Camtec JNT Pad. If unsure, say N.
+
+endif # SLIP
diff --git a/drivers/net/slip/Makefile b/drivers/net/slip/Makefile
new file mode 100644
index 0000000..e3ebc59
--- /dev/null
+++ b/drivers/net/slip/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the SLIP network device drivers.
+#
+
+obj-$(CONFIG_SLIP) += slip.o
+obj-$(CONFIG_SLHC) += slhc.o
diff --git a/drivers/net/slhc.c b/drivers/net/slip/slhc.c
similarity index 100%
rename from drivers/net/slhc.c
rename to drivers/net/slip/slhc.c
diff --git a/drivers/net/slip.c b/drivers/net/slip/slip.c
similarity index 100%
rename from drivers/net/slip.c
rename to drivers/net/slip/slip.c
diff --git a/drivers/net/slip.h b/drivers/net/slip/slip.h
similarity index 100%
rename from drivers/net/slip.h
rename to drivers/net/slip/slip.h
--
1.7.6
^ permalink raw reply related
* [net-next 6/9] ixbmtr_cs: Move the IBM PCMCIA Token Ring driver
From: Jeff Kirsher @ 2011-08-24 4:39 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, Mike Phillips, Burt Silverman
In-Reply-To: <1314160774-6980-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the IBM PCMCIA Token Ring driver into drivers/net/tokenring/ with
the other Token Ring drivers. Made the necessary Kconfig and Makefile
changes as well.
CC: Mike Phillips <phillim@amtrak.com>
CC: Burt Silverman <burts@us.ibm.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/pcmcia/Kconfig | 11 -----------
drivers/net/pcmcia/Makefile | 2 --
drivers/net/tokenring/Kconfig | 13 ++++++++++++-
drivers/net/tokenring/Makefile | 21 +++++++++++----------
drivers/net/{pcmcia => tokenring}/ibmtr_cs.c | 2 +-
5 files changed, 24 insertions(+), 25 deletions(-)
rename drivers/net/{pcmcia => tokenring}/ibmtr_cs.c (99%)
diff --git a/drivers/net/pcmcia/Kconfig b/drivers/net/pcmcia/Kconfig
index 12e7ae4..ff4deb0 100644
--- a/drivers/net/pcmcia/Kconfig
+++ b/drivers/net/pcmcia/Kconfig
@@ -31,15 +31,4 @@ config ARCNET_COM20020_CS
To compile this driver as a module, choose M here: the module will be
called com20020_cs. If unsure, say N.
-config PCMCIA_IBMTR
- tristate "IBM PCMCIA tokenring adapter support"
- depends on IBMTR!=y && TR
- help
- Say Y here if you intend to attach this type of Token Ring PCMCIA
- card to your computer. You then also need to say Y to "Token Ring
- driver support".
-
- To compile this driver as a module, choose M here: the module will be
- called ibmtr_cs.
-
endif # NET_PCMCIA
diff --git a/drivers/net/pcmcia/Makefile b/drivers/net/pcmcia/Makefile
index 618e816..b98a0a4 100644
--- a/drivers/net/pcmcia/Makefile
+++ b/drivers/net/pcmcia/Makefile
@@ -4,5 +4,3 @@
# 16-bit client drivers
obj-$(CONFIG_ARCNET_COM20020_CS)+= com20020_cs.o
-
-obj-$(CONFIG_PCMCIA_IBMTR) += ibmtr_cs.o
diff --git a/drivers/net/tokenring/Kconfig b/drivers/net/tokenring/Kconfig
index c4137b0..0f70158 100644
--- a/drivers/net/tokenring/Kconfig
+++ b/drivers/net/tokenring/Kconfig
@@ -6,7 +6,7 @@
menuconfig TR
tristate "Token Ring driver support"
depends on NETDEVICES && !UML
- depends on (PCI || ISA || MCA || CCW)
+ depends on (PCI || ISA || MCA || CCW || PCMCIA)
select LLC
help
Token Ring is IBM's way of communication on a local network; the
@@ -20,6 +20,17 @@ menuconfig TR
if TR
+config PCMCIA_IBMTR
+ tristate "IBM PCMCIA tokenring adapter support"
+ depends on IBMTR!=y && PCMCIA
+ ---help---
+ Say Y here if you intend to attach this type of Token Ring PCMCIA
+ card to your computer. You then also need to say Y to "Token Ring
+ driver support".
+
+ To compile this driver as a module, choose M here: the module will be
+ called ibmtr_cs.
+
config IBMTR
tristate "IBM Tropic chipset based adapter support"
depends on ISA || MCA
diff --git a/drivers/net/tokenring/Makefile b/drivers/net/tokenring/Makefile
index c88b0a5..f1be8d9 100644
--- a/drivers/net/tokenring/Makefile
+++ b/drivers/net/tokenring/Makefile
@@ -2,14 +2,15 @@
# Makefile for drivers/net/tokenring
#
-obj-$(CONFIG_IBMTR) += ibmtr.o
-obj-$(CONFIG_IBMOL) += olympic.o
-obj-$(CONFIG_IBMLS) += lanstreamer.o
-obj-$(CONFIG_TMS380TR) += tms380tr.o
-obj-$(CONFIG_ABYSS) += abyss.o
-obj-$(CONFIG_MADGEMC) += madgemc.o
-obj-$(CONFIG_PROTEON) += proteon.o
-obj-$(CONFIG_TMSPCI) += tmspci.o
-obj-$(CONFIG_SKISA) += skisa.o
-obj-$(CONFIG_SMCTR) += smctr.o
+obj-$(CONFIG_PCMCIA_IBMTR) += ibmtr_cs.o
+obj-$(CONFIG_IBMTR) += ibmtr.o
+obj-$(CONFIG_IBMOL) += olympic.o
+obj-$(CONFIG_IBMLS) += lanstreamer.o
+obj-$(CONFIG_TMS380TR) += tms380tr.o
+obj-$(CONFIG_ABYSS) += abyss.o
+obj-$(CONFIG_MADGEMC) += madgemc.o
+obj-$(CONFIG_PROTEON) += proteon.o
+obj-$(CONFIG_TMSPCI) += tmspci.o
+obj-$(CONFIG_SKISA) += skisa.o
+obj-$(CONFIG_SMCTR) += smctr.o
obj-$(CONFIG_3C359) += 3c359.o
diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/tokenring/ibmtr_cs.c
similarity index 99%
rename from drivers/net/pcmcia/ibmtr_cs.c
rename to drivers/net/tokenring/ibmtr_cs.c
index 6006d54..91b6846 100644
--- a/drivers/net/pcmcia/ibmtr_cs.c
+++ b/drivers/net/tokenring/ibmtr_cs.c
@@ -66,7 +66,7 @@
#include <asm/system.h>
#define PCMCIA
-#include "../tokenring/ibmtr.c"
+#include "ibmtr.c"
/*====================================================================*/
--
1.7.6
^ permalink raw reply related
* [net-next 8/9] drivers/net: Kconfig & Makefile cleanup
From: Jeff Kirsher @ 2011-08-24 4:39 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo
In-Reply-To: <1314160774-6980-1-git-send-email-jeffrey.t.kirsher@intel.com>
The is does a general cleanup of the drivers/net/ Kconfig and
Makefile. This patch create a "core" option and places all
the networking core drivers into this option (default is yes
for this option). In addition, it alphabitizes the Kconfig
driver options.
As a side cleanup, found that the arcnet, token ring, and PHY
Kconfig options were a tri-state option and should have been
a bool option.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/Kconfig | 267 +++++++++++++++++++++--------------------
drivers/net/Makefile | 63 ++++------
drivers/net/arcnet/Kconfig | 2 +-
drivers/net/phy/Kconfig | 2 +-
drivers/net/tokenring/Kconfig | 2 +-
5 files changed, 167 insertions(+), 169 deletions(-)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 5762370..583f66c 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -25,18 +25,32 @@ menuconfig NETDEVICES
# that for each of the symbols.
if NETDEVICES
-config IFB
- tristate "Intermediate Functional Block support"
- depends on NET_CLS_ACT
+config NET_CORE
+ default y
+ bool "Network core driver support"
---help---
- This is an intermediate driver that allows sharing of
- resources.
+ You can say N here if you do not intend to use any of the
+ networking core drivers (i.e. VLAN, bridging, bonding, etc.)
+
+if NET_CORE
+
+config BONDING
+ tristate "Bonding driver support"
+ depends on INET
+ depends on IPV6 || IPV6=n
+ ---help---
+ Say 'Y' or 'M' if you wish to be able to 'bond' multiple Ethernet
+ Channels together. This is called 'Etherchannel' by Cisco,
+ 'Trunking' by Sun, 802.3ad by the IEEE, and 'Bonding' in Linux.
+
+ The driver supports multiple bonding modes to allow for both high
+ performance and high availability operation.
+
+ Refer to <file:Documentation/networking/bonding.txt> for more
+ information.
+
To compile this driver as a module, choose M here: the module
- will be called ifb. If you want to use more than one ifb
- device at a time, you need to compile this driver as a module.
- Instead of 'ifb', the devices will then be called 'ifb0',
- 'ifb1' etc.
- Look at the iproute2 documentation directory for usage etc
+ will be called bonding.
config DUMMY
tristate "Dummy net driver support"
@@ -57,23 +71,59 @@ config DUMMY
Instead of 'dummy', the devices will then be called 'dummy0',
'dummy1' etc.
-config BONDING
- tristate "Bonding driver support"
- depends on INET
- depends on IPV6 || IPV6=n
+config EQUALIZER
+ tristate "EQL (serial line load balancing) support"
---help---
- Say 'Y' or 'M' if you wish to be able to 'bond' multiple Ethernet
- Channels together. This is called 'Etherchannel' by Cisco,
- 'Trunking' by Sun, 802.3ad by the IEEE, and 'Bonding' in Linux.
+ If you have two serial connections to some other computer (this
+ usually requires two modems and two telephone lines) and you use
+ SLIP (the protocol for sending Internet traffic over telephone
+ lines) or PPP (a better SLIP) on them, you can make them behave like
+ one double speed connection using this driver. Naturally, this has
+ to be supported at the other end as well, either with a similar EQL
+ Linux driver or with a Livingston Portmaster 2e.
- The driver supports multiple bonding modes to allow for both high
- performance and high availability operation.
+ Say Y if you want this and read
+ <file:Documentation/networking/eql.txt>. You may also want to read
+ section 6.2 of the NET-3-HOWTO, available from
+ <http://www.tldp.org/docs.html#howto>.
- Refer to <file:Documentation/networking/bonding.txt> for more
- information.
+ To compile this driver as a module, choose M here: the module
+ will be called eql. If unsure, say N.
+
+config NET_FC
+ bool "Fibre Channel driver support"
+ depends on SCSI && PCI
+ help
+ Fibre Channel is a high speed serial protocol mainly used to connect
+ large storage devices to the computer; it is compatible with and
+ intended to replace SCSI.
+
+ If you intend to use Fibre Channel, you need to have a Fibre channel
+ adaptor card in your computer; say Y here and to the driver for your
+ adaptor below. You also should have said Y to "SCSI support" and
+ "SCSI generic support".
+config MII
+ tristate "Generic Media Independent Interface device support"
+ help
+ Most ethernet controllers have MII transceiver either as an external
+ or internal device. It is safe to say Y or M here even if your
+ ethernet card lacks MII.
+
+source "drivers/ieee802154/Kconfig"
+
+config IFB
+ tristate "Intermediate Functional Block support"
+ depends on NET_CLS_ACT
+ ---help---
+ This is an intermediate driver that allows sharing of
+ resources.
To compile this driver as a module, choose M here: the module
- will be called bonding.
+ will be called ifb. If you want to use more than one ifb
+ device at a time, you need to compile this driver as a module.
+ Instead of 'ifb', the devices will then be called 'ifb0',
+ 'ifb1' etc.
+ Look at the iproute2 documentation directory for usage etc
config MACVLAN
tristate "MAC-VLAN support (EXPERIMENTAL)"
@@ -102,24 +152,46 @@ config MACVTAP
To compile this driver as a module, choose M here: the module
will be called macvtap.
-config EQUALIZER
- tristate "EQL (serial line load balancing) support"
+config NETCONSOLE
+ tristate "Network console logging support"
---help---
- If you have two serial connections to some other computer (this
- usually requires two modems and two telephone lines) and you use
- SLIP (the protocol for sending Internet traffic over telephone
- lines) or PPP (a better SLIP) on them, you can make them behave like
- one double speed connection using this driver. Naturally, this has
- to be supported at the other end as well, either with a similar EQL
- Linux driver or with a Livingston Portmaster 2e.
+ If you want to log kernel messages over the network, enable this.
+ See <file:Documentation/networking/netconsole.txt> for details.
- Say Y if you want this and read
- <file:Documentation/networking/eql.txt>. You may also want to read
- section 6.2 of the NET-3-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>.
+config NETCONSOLE_DYNAMIC
+ bool "Dynamic reconfiguration of logging targets"
+ depends on NETCONSOLE && SYSFS && CONFIGFS_FS && \
+ !(NETCONSOLE=y && CONFIGFS_FS=m)
+ help
+ This option enables the ability to dynamically reconfigure target
+ parameters (interface, IP addresses, port numbers, MAC addresses)
+ at runtime through a userspace interface exported using configfs.
+ See <file:Documentation/networking/netconsole.txt> for details.
- To compile this driver as a module, choose M here: the module
- will be called eql. If unsure, say N.
+config NETPOLL
+ def_bool NETCONSOLE
+
+config NETPOLL_TRAP
+ bool "Netpoll traffic trapping"
+ default n
+ depends on NETPOLL
+
+config NET_POLL_CONTROLLER
+ def_bool NETPOLL
+
+config RIONET
+ tristate "RapidIO Ethernet over messaging driver support"
+ depends on RAPIDIO
+
+config RIONET_TX_SIZE
+ int "Number of outbound queue entries"
+ depends on RIONET
+ default "128"
+
+config RIONET_RX_SIZE
+ int "Number of inbound queue entries"
+ depends on RIONET
+ default "128"
config TUN
tristate "Universal TUN/TAP device driver support"
@@ -151,6 +223,28 @@ config VETH
When one end receives the packet it appears on its pair and vice
versa.
+config VIRTIO_NET
+ tristate "Virtio network driver (EXPERIMENTAL)"
+ depends on EXPERIMENTAL && VIRTIO
+ ---help---
+ This is the virtual network driver for virtio. It can be used with
+ lguest or QEMU based VMMs (like KVM or Xen). Say Y or M.
+
+endif # NET_CORE
+
+config SUNGEM_PHY
+ tristate
+
+source "drivers/net/arcnet/Kconfig"
+
+source "drivers/atm/Kconfig"
+
+source "drivers/net/caif/Kconfig"
+
+source "drivers/net/ethernet/Kconfig"
+
+source "drivers/net/fddi/Kconfig"
+
config NET_SB1000
tristate "General Instruments Surfboard 1000"
depends on PNP
@@ -175,52 +269,26 @@ config NET_SB1000
If you don't have this card, of course say N.
-source "drivers/net/arcnet/Kconfig"
-
-config MII
- tristate "Generic Media Independent Interface device support"
- help
- Most ethernet controllers have MII transceiver either as an external
- or internal device. It is safe to say Y or M here even if your
- ethernet card lacks MII.
-
source "drivers/net/phy/Kconfig"
-config SUNGEM_PHY
- tristate
-
-#
-# Ethernet
-#
-
-source "drivers/net/ethernet/Kconfig"
-
-source "drivers/net/fddi/Kconfig"
-
source "drivers/net/plip/Kconfig"
+source "drivers/net/ppp/Kconfig"
+
source "drivers/net/slip/Kconfig"
+source "drivers/s390/net/Kconfig"
+
source "drivers/net/tokenring/Kconfig"
+source "drivers/net/usb/Kconfig"
+
source "drivers/net/wireless/Kconfig"
source "drivers/net/wimax/Kconfig"
-source "drivers/net/usb/Kconfig"
-
-source "drivers/net/ppp/Kconfig"
-
source "drivers/net/wan/Kconfig"
-source "drivers/atm/Kconfig"
-
-source "drivers/ieee802154/Kconfig"
-
-source "drivers/s390/net/Kconfig"
-
-source "drivers/net/caif/Kconfig"
-
config XEN_NETDEV_FRONTEND
tristate "Xen network device frontend driver"
depends on XEN
@@ -260,67 +328,6 @@ config XEN_NETDEV_BACKEND
compile this driver as a module, chose M here: the module
will be called xen-netback.
-config RIONET
- tristate "RapidIO Ethernet over messaging driver support"
- depends on RAPIDIO
-
-config RIONET_TX_SIZE
- int "Number of outbound queue entries"
- depends on RIONET
- default "128"
-
-config RIONET_RX_SIZE
- int "Number of inbound queue entries"
- depends on RIONET
- default "128"
-
-config NET_FC
- bool "Fibre Channel driver support"
- depends on SCSI && PCI
- help
- Fibre Channel is a high speed serial protocol mainly used to connect
- large storage devices to the computer; it is compatible with and
- intended to replace SCSI.
-
- If you intend to use Fibre Channel, you need to have a Fibre channel
- adaptor card in your computer; say Y here and to the driver for your
- adaptor below. You also should have said Y to "SCSI support" and
- "SCSI generic support".
-
-config NETCONSOLE
- tristate "Network console logging support"
- ---help---
- If you want to log kernel messages over the network, enable this.
- See <file:Documentation/networking/netconsole.txt> for details.
-
-config NETCONSOLE_DYNAMIC
- bool "Dynamic reconfiguration of logging targets"
- depends on NETCONSOLE && SYSFS && CONFIGFS_FS && \
- !(NETCONSOLE=y && CONFIGFS_FS=m)
- help
- This option enables the ability to dynamically reconfigure target
- parameters (interface, IP addresses, port numbers, MAC addresses)
- at runtime through a userspace interface exported using configfs.
- See <file:Documentation/networking/netconsole.txt> for details.
-
-config NETPOLL
- def_bool NETCONSOLE
-
-config NETPOLL_TRAP
- bool "Netpoll traffic trapping"
- default n
- depends on NETPOLL
-
-config NET_POLL_CONTROLLER
- def_bool NETPOLL
-
-config VIRTIO_NET
- tristate "Virtio network driver (EXPERIMENTAL)"
- depends on EXPERIMENTAL && VIRTIO
- ---help---
- This is the virtual network driver for virtio. It can be used with
- lguest or QEMU based VMMs (like KVM or Xen). Say Y or M.
-
config VMXNET3
tristate "VMware VMXNET3 ethernet driver"
depends on PCI && INET
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index d04d0ce..33ff347 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -2,46 +2,51 @@
# Makefile for the Linux network device drivers.
#
-obj-$(CONFIG_MII) += mii.o
-obj-$(CONFIG_MDIO) += mdio.o
-obj-$(CONFIG_PHYLIB) += phy/
-obj-$(CONFIG_CAN) += can/
-obj-$(CONFIG_BONDING) += bonding/
-obj-$(CONFIG_VMXNET3) += vmxnet3/
-
#
-# link order important here
+# Networking Core Drivers
#
-obj-$(CONFIG_RIONET) += rionet.o
-
-#
-# end link order section
-#
-
-obj-$(CONFIG_NET) += Space.o loopback.o
-obj-$(CONFIG_NET_SB1000) += sb1000.o
-
-obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
-obj-$(CONFIG_XEN_NETDEV_BACKEND) += xen-netback/
-
+obj-$(CONFIG_BONDING) += bonding/
obj-$(CONFIG_DUMMY) += dummy.o
+obj-$(CONFIG_EQUALIZER) += eql.o
obj-$(CONFIG_IFB) += ifb.o
obj-$(CONFIG_MACVLAN) += macvlan.o
obj-$(CONFIG_MACVTAP) += macvtap.o
-obj-$(CONFIG_EQUALIZER) += eql.o
+obj-$(CONFIG_MII) += mii.o
+obj-$(CONFIG_MDIO) += mdio.o
+obj-$(CONFIG_NET) += Space.o loopback.o
+obj-$(CONFIG_NETCONSOLE) += netconsole.o
+obj-$(CONFIG_PHYLIB) += phy/
+obj-$(CONFIG_RIONET) += rionet.o
obj-$(CONFIG_TUN) += tun.o
obj-$(CONFIG_VETH) += veth.o
+obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
+#
+# Networking Drivers
+#
+obj-$(CONFIG_ARCNET) += arcnet/
obj-$(CONFIG_DEV_APPLETALK) += appletalk/
+obj-$(CONFIG_CAIF) += caif/
+obj-$(CONFIG_CAN) += can/
+obj-$(CONFIG_ETRAX_ETHERNET) += cris/
obj-$(CONFIG_ETHERNET) += ethernet/
obj-$(CONFIG_FDDI) += fddi/
obj-$(CONFIG_HIPPI) += hippi/
+obj-$(CONFIG_HAMRADIO) += hamradio/
+obj-$(CONFIG_IRDA) += irda/
obj-$(CONFIG_PLIP) += plip/
onj-$(CONFIG_PPP) += ppp/
+obj-$(CONFIG_NET_SB1000) += sb1000.o
onj-$(CONFIG_SLIP) += slip/
+obj-$(CONFIG_SUNGEM_PHY) += sungem_phy.o
obj-$(CONFIG_TR) += tokenring/
obj-$(CONFIG_WAN) += wan/
-obj-$(CONFIG_ARCNET) += arcnet/
+obj-$(CONFIG_WLAN) += wireless/
+obj-$(CONFIG_WIMAX) += wimax/
+
+obj-$(CONFIG_VMXNET3) += vmxnet3/
+obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
+obj-$(CONFIG_XEN_NETDEV_BACKEND) += xen-netback/
obj-$(CONFIG_USB_CATC) += usb/
obj-$(CONFIG_USB_KAWETH) += usb/
@@ -52,17 +57,3 @@ obj-$(CONFIG_USB_USBNET) += usb/
obj-$(CONFIG_USB_ZD1201) += usb/
obj-$(CONFIG_USB_IPHETH) += usb/
obj-$(CONFIG_USB_CDC_PHONET) += usb/
-
-obj-$(CONFIG_WLAN) += wireless/
-obj-$(CONFIG_HAMRADIO) += hamradio/
-obj-$(CONFIG_IRDA) += irda/
-obj-$(CONFIG_ETRAX_ETHERNET) += cris/
-
-obj-$(CONFIG_NETCONSOLE) += netconsole.o
-
-obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
-
-obj-$(CONFIG_WIMAX) += wimax/
-obj-$(CONFIG_CAIF) += caif/
-
-obj-$(CONFIG_SUNGEM_PHY) += sungem_phy.o
diff --git a/drivers/net/arcnet/Kconfig b/drivers/net/arcnet/Kconfig
index 84fb634..a73d9dc 100644
--- a/drivers/net/arcnet/Kconfig
+++ b/drivers/net/arcnet/Kconfig
@@ -4,7 +4,7 @@
menuconfig ARCNET
depends on NETDEVICES && (ISA || PCI || PCMCIA)
- tristate "ARCnet support"
+ bool "ARCnet support"
---help---
If you have a network card of this type, say Y and check out the
(arguably) beautiful poetry in
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index a702443..bb88e12 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -3,7 +3,7 @@
#
menuconfig PHYLIB
- tristate "PHY Device support and infrastructure"
+ bool "PHY Device support and infrastructure"
depends on !S390
depends on NETDEVICES
help
diff --git a/drivers/net/tokenring/Kconfig b/drivers/net/tokenring/Kconfig
index 0f70158..c7e0149 100644
--- a/drivers/net/tokenring/Kconfig
+++ b/drivers/net/tokenring/Kconfig
@@ -4,7 +4,7 @@
# So far, we only have PCI, ISA, and MCA token ring devices
menuconfig TR
- tristate "Token Ring driver support"
+ bool "Token Ring driver support"
depends on NETDEVICES && !UML
depends on (PCI || ISA || MCA || CCW || PCMCIA)
select LLC
--
1.7.6
^ permalink raw reply related
* [net-next 7/9] com20020_cs: Move the PCMCIA Arcnet driver
From: Jeff Kirsher @ 2011-08-24 4:39 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, Arnaldo Carvalho de Melo
In-Reply-To: <1314160774-6980-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the COM20020 PCMICA Arcnet driver into drivers/net/arcnet/ with
the other Arcnet drivers. Made the necessary Kconfig and Makefile
changes as well.
Since this was the "last" PCMCIA driver in drivers/net/pcmcia/, this patch
also cleans up the references to drivers/net/pcmcia.
CC: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/Kconfig | 2 -
drivers/net/Makefile | 1 -
drivers/net/arcnet/Kconfig | 12 ++++++++-
drivers/net/arcnet/Makefile | 1 +
drivers/net/{pcmcia => arcnet}/com20020_cs.c | 0
drivers/net/pcmcia/Kconfig | 34 --------------------------
drivers/net/pcmcia/Makefile | 6 ----
7 files changed, 12 insertions(+), 44 deletions(-)
rename drivers/net/{pcmcia => arcnet}/com20020_cs.c (100%)
delete mode 100644 drivers/net/pcmcia/Kconfig
delete mode 100644 drivers/net/pcmcia/Makefile
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index b3206c9..5762370 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -209,8 +209,6 @@ source "drivers/net/wimax/Kconfig"
source "drivers/net/usb/Kconfig"
-source "drivers/net/pcmcia/Kconfig"
-
source "drivers/net/ppp/Kconfig"
source "drivers/net/wan/Kconfig"
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 23ea83c..d04d0ce 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -42,7 +42,6 @@ onj-$(CONFIG_SLIP) += slip/
obj-$(CONFIG_TR) += tokenring/
obj-$(CONFIG_WAN) += wan/
obj-$(CONFIG_ARCNET) += arcnet/
-obj-$(CONFIG_NET_PCMCIA) += pcmcia/
obj-$(CONFIG_USB_CATC) += usb/
obj-$(CONFIG_USB_KAWETH) += usb/
diff --git a/drivers/net/arcnet/Kconfig b/drivers/net/arcnet/Kconfig
index 3b2f7f1..84fb634 100644
--- a/drivers/net/arcnet/Kconfig
+++ b/drivers/net/arcnet/Kconfig
@@ -3,7 +3,7 @@
#
menuconfig ARCNET
- depends on NETDEVICES && (ISA || PCI)
+ depends on NETDEVICES && (ISA || PCI || PCMCIA)
tristate "ARCnet support"
---help---
If you have a network card of this type, say Y and check out the
@@ -123,4 +123,14 @@ config ARCNET_COM20020_PCI
tristate "Support for COM20020 on PCI"
depends on ARCNET_COM20020 && PCI
+config ARCNET_COM20020_CS
+ tristate "COM20020 ARCnet PCMCIA support"
+ depends on ARCNET_COM20020 && PCMCIA
+ help
+ Say Y here if you intend to attach this type of ARCnet PCMCIA card
+ to your computer.
+
+ To compile this driver as a module, choose M here: the module will be
+ called com20020_cs. If unsure, say N.
+
endif # ARCNET
diff --git a/drivers/net/arcnet/Makefile b/drivers/net/arcnet/Makefile
index 5861af5..5ce8ee6 100644
--- a/drivers/net/arcnet/Makefile
+++ b/drivers/net/arcnet/Makefile
@@ -12,3 +12,4 @@ obj-$(CONFIG_ARCNET_RIM_I) += arc-rimi.o
obj-$(CONFIG_ARCNET_COM20020) += com20020.o
obj-$(CONFIG_ARCNET_COM20020_ISA) += com20020-isa.o
obj-$(CONFIG_ARCNET_COM20020_PCI) += com20020-pci.o
+obj-$(CONFIG_ARCNET_COM20020_CS) += com20020_cs.o
diff --git a/drivers/net/pcmcia/com20020_cs.c b/drivers/net/arcnet/com20020_cs.c
similarity index 100%
rename from drivers/net/pcmcia/com20020_cs.c
rename to drivers/net/arcnet/com20020_cs.c
diff --git a/drivers/net/pcmcia/Kconfig b/drivers/net/pcmcia/Kconfig
deleted file mode 100644
index ff4deb0..0000000
--- a/drivers/net/pcmcia/Kconfig
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# PCMCIA Network device configuration
-#
-
-menuconfig NET_PCMCIA
- bool "PCMCIA network device support"
- depends on PCMCIA
- ---help---
- Say Y if you would like to include support for any PCMCIA or CardBus
- network adapters, then say Y to the driver for your particular card
- below. PCMCIA- or PC-cards are credit-card size devices often used
- with laptops computers; CardBus is the newer and faster version of
- PCMCIA.
-
- To use your PC-cards, you will need supporting software from David
- Hinds' pcmcia-cs package (see the file <file:Documentation/Changes>
- for location). You also want to check out the PCMCIA-HOWTO,
- available from <http://www.tldp.org/docs.html#howto>.
-
- If unsure, say N.
-
-if NET_PCMCIA && PCMCIA
-
-config ARCNET_COM20020_CS
- tristate "COM20020 ARCnet PCMCIA support"
- depends on ARCNET_COM20020
- help
- Say Y here if you intend to attach this type of ARCnet PCMCIA card
- to your computer.
-
- To compile this driver as a module, choose M here: the module will be
- called com20020_cs. If unsure, say N.
-
-endif # NET_PCMCIA
diff --git a/drivers/net/pcmcia/Makefile b/drivers/net/pcmcia/Makefile
deleted file mode 100644
index b98a0a4..0000000
--- a/drivers/net/pcmcia/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Makefile for the Linux PCMCIA network device drivers.
-#
-
-# 16-bit client drivers
-obj-$(CONFIG_ARCNET_COM20020_CS)+= com20020_cs.o
--
1.7.6
^ permalink raw reply related
* [net-next 9/9] drivers/net/ethernet/*: Enabled vendor Kconfig options
From: Jeff Kirsher @ 2011-08-24 4:39 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, Stephen Rothwll
In-Reply-To: <1314160774-6980-1-git-send-email-jeffrey.t.kirsher@intel.com>
Based on finds for Stephen Rothwell, where current defconfig's
enable a ethernet driver and it is not compiled due to the newly
added NET_VENDOR_* component of Kconfig.
This patch enables all the "new" Kconfig options so that current
defconfig's will continue to compile the expected drivers. In
addition, by enabling all the new Kconfig options does not add
any un-expected options.
CC: Stephen Rothwll <sfc@canb.auug.org.au>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/3com/Kconfig | 1 +
drivers/net/ethernet/8390/Kconfig | 1 +
drivers/net/ethernet/adaptec/Kconfig | 1 +
drivers/net/ethernet/alteon/Kconfig | 1 +
drivers/net/ethernet/amd/Kconfig | 1 +
drivers/net/ethernet/apple/Kconfig | 1 +
drivers/net/ethernet/atheros/Kconfig | 1 +
drivers/net/ethernet/broadcom/Kconfig | 1 +
drivers/net/ethernet/brocade/Kconfig | 1 +
drivers/net/ethernet/chelsio/Kconfig | 1 +
drivers/net/ethernet/cirrus/Kconfig | 1 +
drivers/net/ethernet/cisco/Kconfig | 1 +
drivers/net/ethernet/dec/Kconfig | 1 +
drivers/net/ethernet/dlink/Kconfig | 1 +
drivers/net/ethernet/emulex/Kconfig | 1 +
drivers/net/ethernet/faraday/Kconfig | 1 +
drivers/net/ethernet/freescale/Kconfig | 1 +
drivers/net/ethernet/fujitsu/Kconfig | 1 +
drivers/net/ethernet/hp/Kconfig | 1 +
drivers/net/ethernet/i825xx/Kconfig | 1 +
drivers/net/ethernet/ibm/Kconfig | 1 +
drivers/net/ethernet/intel/Kconfig | 1 +
drivers/net/ethernet/marvell/Kconfig | 1 +
drivers/net/ethernet/mellanox/Kconfig | 1 +
drivers/net/ethernet/micrel/Kconfig | 1 +
drivers/net/ethernet/microchip/Kconfig | 1 +
drivers/net/ethernet/myricom/Kconfig | 1 +
drivers/net/ethernet/natsemi/Kconfig | 1 +
drivers/net/ethernet/neterion/Kconfig | 1 +
drivers/net/ethernet/nuvoton/Kconfig | 1 +
drivers/net/ethernet/nvidia/Kconfig | 1 +
drivers/net/ethernet/oki-semi/Kconfig | 1 +
drivers/net/ethernet/pasemi/Kconfig | 1 +
drivers/net/ethernet/qlogic/Kconfig | 1 +
drivers/net/ethernet/racal/Kconfig | 1 +
drivers/net/ethernet/rdc/Kconfig | 1 +
drivers/net/ethernet/realtek/Kconfig | 1 +
drivers/net/ethernet/seeq/Kconfig | 1 +
drivers/net/ethernet/sgi/Kconfig | 1 +
drivers/net/ethernet/sis/Kconfig | 1 +
drivers/net/ethernet/smsc/Kconfig | 1 +
drivers/net/ethernet/stmicro/Kconfig | 1 +
drivers/net/ethernet/sun/Kconfig | 1 +
drivers/net/ethernet/tehuti/Kconfig | 1 +
drivers/net/ethernet/ti/Kconfig | 1 +
drivers/net/ethernet/toshiba/Kconfig | 1 +
drivers/net/ethernet/tundra/Kconfig | 1 +
drivers/net/ethernet/via/Kconfig | 1 +
drivers/net/ethernet/xilinx/Kconfig | 1 +
drivers/net/ethernet/xircom/Kconfig | 1 +
drivers/net/ethernet/xscale/Kconfig | 1 +
51 files changed, 51 insertions(+), 0 deletions(-)
diff --git a/drivers/net/ethernet/3com/Kconfig b/drivers/net/ethernet/3com/Kconfig
index 65cc129..a439cbd 100644
--- a/drivers/net/ethernet/3com/Kconfig
+++ b/drivers/net/ethernet/3com/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_3COM
bool "3Com devices"
+ default y
depends on ISA || EISA || MCA || PCI || PCMCIA
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/8390/Kconfig b/drivers/net/ethernet/8390/Kconfig
index 5d21698..e04ade4 100644
--- a/drivers/net/ethernet/8390/Kconfig
+++ b/drivers/net/ethernet/8390/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_8390
bool "National Semi-conductor 8390 devices"
+ default y
depends on NET_VENDOR_NATSEMI && (AMIGA_PCMCIA || PCI || SUPERH || \
ISA || MCA || EISA || MAC || M32R || MACH_TX49XX || \
MCA_LEGACY || H8300 || ARM || MIPS || ZORRO || PCMCIA || \
diff --git a/drivers/net/ethernet/adaptec/Kconfig b/drivers/net/ethernet/adaptec/Kconfig
index 5e9dbe9..5c804bb 100644
--- a/drivers/net/ethernet/adaptec/Kconfig
+++ b/drivers/net/ethernet/adaptec/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_ADAPTEC
bool "Adaptec devices"
+ default y
depends on PCI
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/alteon/Kconfig b/drivers/net/ethernet/alteon/Kconfig
index 68862e4..799a852 100644
--- a/drivers/net/ethernet/alteon/Kconfig
+++ b/drivers/net/ethernet/alteon/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_ALTEON
bool "Alteon devices"
+ default y
depends on PCI
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/amd/Kconfig b/drivers/net/ethernet/amd/Kconfig
index 0513940..8af1c93 100644
--- a/drivers/net/ethernet/amd/Kconfig
+++ b/drivers/net/ethernet/amd/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_AMD
bool "AMD devices"
+ default y
depends on DIO || MACH_DECSTATION || MVME147 || ATARI || SUN3 || \
SUN3X || SBUS || PCI || ZORRO || (ISA && ISA_DMA_API) || \
(ARM && ARCH_EBSA110) || ISA || EISA || MCA || PCMCIA
diff --git a/drivers/net/ethernet/apple/Kconfig b/drivers/net/ethernet/apple/Kconfig
index fc796bc..59d5c26 100644
--- a/drivers/net/ethernet/apple/Kconfig
+++ b/drivers/net/ethernet/apple/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_APPLE
bool "Apple devices"
+ default y
depends on (PPC_PMAC && PPC32) || MAC || ISA || EISA || MACH_IXDP2351 \
|| ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440
---help---
diff --git a/drivers/net/ethernet/atheros/Kconfig b/drivers/net/ethernet/atheros/Kconfig
index 966c6c7..26ab8ca 100644
--- a/drivers/net/ethernet/atheros/Kconfig
+++ b/drivers/net/ethernet/atheros/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_ATHEROS
bool "Atheros devices"
+ default y
depends on PCI
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig
index 8986e57..d82ad22 100644
--- a/drivers/net/ethernet/broadcom/Kconfig
+++ b/drivers/net/ethernet/broadcom/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_BROADCOM
bool "Broadcom devices"
+ default y
depends on (SSB_POSSIBLE && HAS_DMA) || PCI || BCM63XX || \
SIBYTE_SB1xxx_SOC
---help---
diff --git a/drivers/net/ethernet/brocade/Kconfig b/drivers/net/ethernet/brocade/Kconfig
index 03f0b17..2641557 100644
--- a/drivers/net/ethernet/brocade/Kconfig
+++ b/drivers/net/ethernet/brocade/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_BROCADE
bool "Brocade devices"
+ default y
depends on PCI
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/chelsio/Kconfig b/drivers/net/ethernet/chelsio/Kconfig
index 7b54574..2de50f9 100644
--- a/drivers/net/ethernet/chelsio/Kconfig
+++ b/drivers/net/ethernet/chelsio/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_CHELSIO
bool "Chelsio devices"
+ default y
depends on PCI || INET
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/cirrus/Kconfig b/drivers/net/ethernet/cirrus/Kconfig
index 53ebe78..e0cacf6 100644
--- a/drivers/net/ethernet/cirrus/Kconfig
+++ b/drivers/net/ethernet/cirrus/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_CIRRUS
bool "Cirrus devices"
+ default y
depends on ARM && ARCH_EP93XX
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/cisco/Kconfig b/drivers/net/ethernet/cisco/Kconfig
index bbd5348..94606f7 100644
--- a/drivers/net/ethernet/cisco/Kconfig
+++ b/drivers/net/ethernet/cisco/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_CISCO
bool "Cisco devices"
+ default y
depends on PCI && INET
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/dec/Kconfig b/drivers/net/ethernet/dec/Kconfig
index 40e8df9..3794027 100644
--- a/drivers/net/ethernet/dec/Kconfig
+++ b/drivers/net/ethernet/dec/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_DEC
bool "Digital Equipment devices"
+ default y
depends on PCI || EISA || CARDBUS
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/dlink/Kconfig b/drivers/net/ethernet/dlink/Kconfig
index 9fdb66b..84a28a6 100644
--- a/drivers/net/ethernet/dlink/Kconfig
+++ b/drivers/net/ethernet/dlink/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_DLINK
bool "D-Link devices"
+ default y
depends on PCI || PARPORT
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/emulex/Kconfig b/drivers/net/ethernet/emulex/Kconfig
index 018ac94..7a28a64 100644
--- a/drivers/net/ethernet/emulex/Kconfig
+++ b/drivers/net/ethernet/emulex/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_EMULEX
bool "Emulex devices"
+ default y
depends on PCI && INET
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/faraday/Kconfig b/drivers/net/ethernet/faraday/Kconfig
index b0d76f0..5918c68 100644
--- a/drivers/net/ethernet/faraday/Kconfig
+++ b/drivers/net/ethernet/faraday/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_FARADAY
bool "Faraday devices"
+ default y
depends on ARM
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/freescale/Kconfig b/drivers/net/ethernet/freescale/Kconfig
index 2fd2c61..4dbe41f 100644
--- a/drivers/net/ethernet/freescale/Kconfig
+++ b/drivers/net/ethernet/freescale/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_FREESCALE
bool "Freescale devices"
+ default y
depends on FSL_SOC || QUICC_ENGINE || CPM1 || CPM2 || PPC_MPC512x || \
M523x || M527x || M5272 || M528x || M520x || M532x || \
IMX_HAVE_PLATFORM_FEC || MXS_HAVE_PLATFORM_FEC || \
diff --git a/drivers/net/ethernet/fujitsu/Kconfig b/drivers/net/ethernet/fujitsu/Kconfig
index 2cd968e..dffee9d 100644
--- a/drivers/net/ethernet/fujitsu/Kconfig
+++ b/drivers/net/ethernet/fujitsu/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_FUJITSU
bool "Fujitsu devices"
+ default y
depends on ISA || PCMCIA || ((ISA || MCA_LEGACY) && EXPERIMENTAL)
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/hp/Kconfig b/drivers/net/ethernet/hp/Kconfig
index 07b42e9..a0b8ece 100644
--- a/drivers/net/ethernet/hp/Kconfig
+++ b/drivers/net/ethernet/hp/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_HP
bool "HP devices"
+ default y
depends on ISA || EISA || PCI
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/i825xx/Kconfig b/drivers/net/ethernet/i825xx/Kconfig
index 5c30a5b..2be4698 100644
--- a/drivers/net/ethernet/i825xx/Kconfig
+++ b/drivers/net/ethernet/i825xx/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_I825XX
bool "Intel (82586/82593/82596) devices"
+ default y
depends on NET_VENDOR_INTEL && (ISA || ISA_DMA_API || ARM || \
ARCH_ACORN || MCA || MCA_LEGACY || SNI_RM || SUN3 || \
GSC || BVME6000 || MVME16x || EXPERIMENTAL)
diff --git a/drivers/net/ethernet/ibm/Kconfig b/drivers/net/ethernet/ibm/Kconfig
index 4c7ef98..9e16f3f 100644
--- a/drivers/net/ethernet/ibm/Kconfig
+++ b/drivers/net/ethernet/ibm/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_IBM
bool "IBM devices"
+ default y
depends on MCA || PPC_PSERIES || PPC_PSERIES || PPC_DCR || \
(IBMEBUS && INET && SPARSEMEM)
---help---
diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig
index 5fe185b..4a98e83 100644
--- a/drivers/net/ethernet/intel/Kconfig
+++ b/drivers/net/ethernet/intel/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_INTEL
bool "Intel devices"
+ default y
depends on PCI || PCI_MSI
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/marvell/Kconfig b/drivers/net/ethernet/marvell/Kconfig
index e525408..0029934 100644
--- a/drivers/net/ethernet/marvell/Kconfig
+++ b/drivers/net/ethernet/marvell/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_MARVELL
bool "Marvell devices"
+ default y
depends on PCI || CPU_PXA168 || MV64X60 || PPC32 || PLAT_ORION || INET
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/mellanox/Kconfig b/drivers/net/ethernet/mellanox/Kconfig
index e069491..d8099a7 100644
--- a/drivers/net/ethernet/mellanox/Kconfig
+++ b/drivers/net/ethernet/mellanox/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_MELLANOX
bool "Mellanox devices"
+ default y
depends on PCI && INET
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/micrel/Kconfig b/drivers/net/ethernet/micrel/Kconfig
index 4227de6..bd090db 100644
--- a/drivers/net/ethernet/micrel/Kconfig
+++ b/drivers/net/ethernet/micrel/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_MICREL
bool "Micrel devices"
+ default y
depends on (HAS_IOMEM && DMA_ENGINE) || SPI || PCI || HAS_IOMEM || \
(ARM && ARCH_KS8695)
---help---
diff --git a/drivers/net/ethernet/microchip/Kconfig b/drivers/net/ethernet/microchip/Kconfig
index 53b0b04..8163fd0 100644
--- a/drivers/net/ethernet/microchip/Kconfig
+++ b/drivers/net/ethernet/microchip/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_MICROCHIP
bool "Microchip devices"
+ default y
depends on SPI && EXPERIMENTAL
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/myricom/Kconfig b/drivers/net/ethernet/myricom/Kconfig
index 1816ae1..540f0c6 100644
--- a/drivers/net/ethernet/myricom/Kconfig
+++ b/drivers/net/ethernet/myricom/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_MYRI
bool "Myricom devices"
+ default y
depends on PCI && INET
---help---
If you have a network (Ethernet) card belonging to this class, say
diff --git a/drivers/net/ethernet/natsemi/Kconfig b/drivers/net/ethernet/natsemi/Kconfig
index 1e5c1e1..4a6b9fd 100644
--- a/drivers/net/ethernet/natsemi/Kconfig
+++ b/drivers/net/ethernet/natsemi/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_NATSEMI
bool "National Semi-conductor devices"
+ default y
depends on MCA || MAC || MACH_JAZZ || PCI || XTENSA_PLATFORM_XT2000
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/neterion/Kconfig b/drivers/net/ethernet/neterion/Kconfig
index 3d98e62..ff26b54 100644
--- a/drivers/net/ethernet/neterion/Kconfig
+++ b/drivers/net/ethernet/neterion/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_EXAR
bool "Exar devices"
+ default y
depends on PCI
---help---
If you have a network (Ethernet) card belonging to this class, say
diff --git a/drivers/net/ethernet/nuvoton/Kconfig b/drivers/net/ethernet/nuvoton/Kconfig
index 3b91c3b..01182b5 100644
--- a/drivers/net/ethernet/nuvoton/Kconfig
+++ b/drivers/net/ethernet/nuvoton/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_NUVOTON
bool "Nuvoton devices"
+ default y
depends on ARM && ARCH_W90X900
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/nvidia/Kconfig b/drivers/net/ethernet/nvidia/Kconfig
index 0a18e73..ace19e7 100644
--- a/drivers/net/ethernet/nvidia/Kconfig
+++ b/drivers/net/ethernet/nvidia/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_NVIDIA
bool "NVIDIA devices"
+ default y
depends on PCI
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/oki-semi/Kconfig b/drivers/net/ethernet/oki-semi/Kconfig
index 97f5e72..ecd45f9 100644
--- a/drivers/net/ethernet/oki-semi/Kconfig
+++ b/drivers/net/ethernet/oki-semi/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_OKI
bool "OKI Semiconductor devices"
+ default y
depends on PCI
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/pasemi/Kconfig b/drivers/net/ethernet/pasemi/Kconfig
index ccb79b8..01e6c32 100644
--- a/drivers/net/ethernet/pasemi/Kconfig
+++ b/drivers/net/ethernet/pasemi/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_PASEMI
bool "PA Semi devices"
+ default y
depends on PPC_PASEMI && PCI && INET
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/qlogic/Kconfig b/drivers/net/ethernet/qlogic/Kconfig
index a7c4424..a8669ad 100644
--- a/drivers/net/ethernet/qlogic/Kconfig
+++ b/drivers/net/ethernet/qlogic/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_QLOGIC
bool "QLogic devices"
+ default y
depends on PCI
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/racal/Kconfig b/drivers/net/ethernet/racal/Kconfig
index 45d4930..01969e0 100644
--- a/drivers/net/ethernet/racal/Kconfig
+++ b/drivers/net/ethernet/racal/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_RACAL
bool "Racal-Interlan (Micom) NI devices"
+ default y
depends on ISA
---help---
If you have a network (Ethernet) card belonging to this class, such
diff --git a/drivers/net/ethernet/rdc/Kconfig b/drivers/net/ethernet/rdc/Kconfig
index b15ebac..2055f7e 100644
--- a/drivers/net/ethernet/rdc/Kconfig
+++ b/drivers/net/ethernet/rdc/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_RDC
bool "RDC devices"
+ default y
depends on PCI
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/realtek/Kconfig b/drivers/net/ethernet/realtek/Kconfig
index a5f67a09..d8df67a 100644
--- a/drivers/net/ethernet/realtek/Kconfig
+++ b/drivers/net/ethernet/realtek/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_REALTEK
bool "Realtek devices"
+ default y
depends on PCI || (PARPORT && X86)
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/seeq/Kconfig b/drivers/net/ethernet/seeq/Kconfig
index 0266791..49b6d5b 100644
--- a/drivers/net/ethernet/seeq/Kconfig
+++ b/drivers/net/ethernet/seeq/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_SEEQ
bool "SEEQ devices"
+ default y
depends on (ARM && ARCH_ACORN) || SGI_HAS_SEEQ || EXPERIMENTAL
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/sgi/Kconfig b/drivers/net/ethernet/sgi/Kconfig
index 3098594..e832f46 100644
--- a/drivers/net/ethernet/sgi/Kconfig
+++ b/drivers/net/ethernet/sgi/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_SGI
bool "SGI devices"
+ default y
depends on (PCI && SGI_IP27) || SGI_IP32
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/sis/Kconfig b/drivers/net/ethernet/sis/Kconfig
index 01d43e8..68d052b 100644
--- a/drivers/net/ethernet/sis/Kconfig
+++ b/drivers/net/ethernet/sis/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_SIS
bool "Silicon Integrated Systems (SiS) devices"
+ default y
depends on PCI
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/smsc/Kconfig b/drivers/net/ethernet/smsc/Kconfig
index 702efe6..f961928 100644
--- a/drivers/net/ethernet/smsc/Kconfig
+++ b/drivers/net/ethernet/smsc/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_SMSC
bool "SMC (SMSC)/Western Digital devices"
+ default y
depends on ARM || ISA || MAC || ARM || MIPS || M32R || SUPERH || \
BLACKFIN || MN10300 || COLDFIRE || PCI || PCMCIA
---help---
diff --git a/drivers/net/ethernet/stmicro/Kconfig b/drivers/net/ethernet/stmicro/Kconfig
index e40df64..f4a80da 100644
--- a/drivers/net/ethernet/stmicro/Kconfig
+++ b/drivers/net/ethernet/stmicro/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_STMICRO
bool "STMicroelectronics devices"
+ default y
depends on HAS_IOMEM
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/sun/Kconfig b/drivers/net/ethernet/sun/Kconfig
index 5132fa6..57bfd85 100644
--- a/drivers/net/ethernet/sun/Kconfig
+++ b/drivers/net/ethernet/sun/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_SUN
bool "Sun devices"
+ default y
depends on SUN3 || SBUS || PCI || SUN_LDOMS
---help---
If you have a network (Ethernet) card belonging to this class, say
diff --git a/drivers/net/ethernet/tehuti/Kconfig b/drivers/net/ethernet/tehuti/Kconfig
index 914ad4059..1fc027e 100644
--- a/drivers/net/ethernet/tehuti/Kconfig
+++ b/drivers/net/ethernet/tehuti/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_TEHUTI
bool "Tehuti devices"
+ default y
depends on PCI
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/ti/Kconfig b/drivers/net/ethernet/ti/Kconfig
index 1284319..de76c70 100644
--- a/drivers/net/ethernet/ti/Kconfig
+++ b/drivers/net/ethernet/ti/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_TI
bool "Texas Instruments (TI) devices"
+ default y
depends on PCI || EISA || AR7 || (ARM && (ARCH_DAVINCI || ARCH_OMAP3))
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/toshiba/Kconfig b/drivers/net/ethernet/toshiba/Kconfig
index 6ef2ce2..0517647 100644
--- a/drivers/net/ethernet/toshiba/Kconfig
+++ b/drivers/net/ethernet/toshiba/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_TOSHIBA
bool "Toshiba devices"
+ default y
depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB) || PPC_PS3
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/tundra/Kconfig b/drivers/net/ethernet/tundra/Kconfig
index 03925d1..cf7d69b 100644
--- a/drivers/net/ethernet/tundra/Kconfig
+++ b/drivers/net/ethernet/tundra/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_TUNDRA
bool "Tundra devices"
+ default y
depends on TSI108_BRIDGE
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/via/Kconfig b/drivers/net/ethernet/via/Kconfig
index 7199194..e5d82a5 100644
--- a/drivers/net/ethernet/via/Kconfig
+++ b/drivers/net/ethernet/via/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_VIA
bool "VIA devices"
+ default y
depends on PCI
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/xilinx/Kconfig b/drivers/net/ethernet/xilinx/Kconfig
index 4e3aad4..d5a8260 100644
--- a/drivers/net/ethernet/xilinx/Kconfig
+++ b/drivers/net/ethernet/xilinx/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_XILINX
bool "Xilinx devices"
+ default y
depends on PPC || PPC32 || MICROBLAZE
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/xircom/Kconfig b/drivers/net/ethernet/xircom/Kconfig
index 3d64e58..69f56a6 100644
--- a/drivers/net/ethernet/xircom/Kconfig
+++ b/drivers/net/ethernet/xircom/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_XIRCOM
bool "Xircom devices"
+ default y
depends on PCMCIA
---help---
If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/xscale/Kconfig b/drivers/net/ethernet/xscale/Kconfig
index 6bbcc54..cf67352 100644
--- a/drivers/net/ethernet/xscale/Kconfig
+++ b/drivers/net/ethernet/xscale/Kconfig
@@ -4,6 +4,7 @@
config NET_VENDOR_XSCALE
bool "Intel XScale IXP devices"
+ default y
depends on NET_VENDOR_INTEL && ((ARM && ARCH_IXP4XX && \
IXP4XX_NPE && IXP4XX_QMGR) || ARCH_ENP2611)
---help---
--
1.7.6
^ permalink raw reply related
* [GIT]: Networking
From: David Miller @ 2011-08-24 4:46 UTC (permalink / raw)
To: torvalds; +Cc: akpm, netdev, linux-kernel
As is usually the case at this point, we're fixing driver problems
and small minor regressions elsewhere:
1) Several rt2x00 bug fixes from Stanislaw Gruszka:
a) Cure oops in rt2800usb_write_tx_desc().
b) Fix flag check order in rt2800usb_work_txdone otherwise we might
skip ready entries.
c) Fix oops in rt2800usb_get_txwi.
2) usbnet cdc_nacm driver DMAs stack variables, fix from Josh Boyer.
3) On gianfar, even when VLAN HW offload is disabled, descriptors
still set VLAN bit, make sure we ignore it in that situation and
don't accidently think the card offloaded VLAN header stripping.
Fix from Jiri Pirko.
4) IPV6 SIT tunnels don't propagate v6 transport class to the ipv4
type of service when they should, fix from Lionel Elie Mamane.
5) Port mirror/redirect doesn't propagate xmit codes to caller, fix
from Jamal Hadi Salim.
6) Fix changing bonding mode from backup to round-robin, from Weiping Pan.
7) Fix erroneous non-tagged packet filtering in via-velocity, from Jiri
Pirko.
8) Like we did for ipv4's IP_PKTOPTIONS, we have to make ipv6's
IPV6_2292PKTOPTIONS handle compat mode properly too. From Daniel Baluta.
9) Fix accidental reintroduce of skb->dev==NULL oopser in ATM's br2684.
From Daniel Schwierzeck.
10) Fix device leak in bridging, from Eric Dumazet.
11) Memory leak fix in wl12xx wireless, from Julia Lawall.
12) FCOE memory leak for DDP packets in ixgbe from Alexander Duyck.
13) Fix half-duplex mode with some chips in e1000e, from Bruce Allan.
14) 82579 e1000e chip can drop packets at 100Mbps, workaround by increasing
PLL counter to trick the PHY, from Bruce Allan.
15) Fix e1000e conflicts with Management Engine that can corrupt the
TX and RX tail pointers. Also from Bruce Allan.
16) Revert one iwlagn change, and part of another, to fix sysfs private
handling and eliminating a bad pointer oops on unload, from
Emmanuel Grumbach.
17) In vmxnet3 do not enable vlan filters in promisc mode, from Jesse Gross.
18) Fix double free in sja1000 CAN driver, from Julia Lawall.
19) Fix build due to missing include in sh_eth.c, from Nobuhiro Iwamatsu.
20) gfar_ethflow_to_filter_table() uses more than 2K of stack space, fix
from Wang Shaoyan.
21) Hopefully fix Ingo's forcedeth vlan regression, from Jiri Pirko.
22) vlan_untag() needs to reset SKB header pointers, from Jiri Pirko.
Please pull, thanks a lot!
The following changes since commit 14c62e78dc1379185515be41903c4a667efc6d54:
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (2011-08-23 18:09:08 -0700)
are available in the git repository at:
master.kernel.org:/pub/scm/linux/kernel/git/davem/net.git master
Alexander Duyck (1):
ixgbe: Fix FCOE memory leak for DDP packets
Bruce Allan (3):
e1000e: Spurious interrupts & dropped packets with 82577/8/9 in half-duplex
e1000e: workaround for packet drop on 82579 at 100Mbps
e1000e: workaround invalid Tx/Rx tail descriptor register write
Daniel Baluta (1):
ipv6: Fix ipv6_getsockopt for IPV6_2292PKTOPTIONS
Daniel Schwierzeck (1):
atm: br2684: Fix oops due to skb->dev being NULL
David S. Miller (2):
Merge branch 'master' of master.kernel.org:/.../jkirsher/net
Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless
Emmanuel Grumbach (2):
Revert "iwlagn: sysfs couldn't find the priv pointer"
iwlagn: sysfs couldn't find the priv pointer
Eric Dumazet (1):
bridge: fix a possible net_device leak
Geoffrey Thomas (1):
net: Documentation: RFC 2553bis is now RFC 3493
Jamal Hadi Salim (1):
net_sched: fix port mirror/redirect stats reporting
Jesse Gross (1):
vmxnet3: Don't enable vlan filters in promiscuous mode.
Jiri Pirko (4):
gianfar: prevent buggy hw rx vlan tagging
via-velocity: remove non-tagged packet filtering
forcedeth: call vlan_mode only if hw supports vlans
vlan: reset headers on accel emulation path
John W. Linville (1):
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem
Josh Boyer (1):
usbnet/cdc_ncm: Don't use stack variables for DMA
Julia Lawall (2):
drivers/net/wireless/wl12xx: add missing kfree
drivers/net/can/sja1000/plx_pci.c: eliminate double free
Lionel Elie Mamane (1):
sit tunnels: propagate IPv6 transport class to IPv4 Type of Service
Nobuhiro Iwamatsu (1):
net: sh_eth: Fix build by forgot including linux/interrupt.h
Peter Pan(潘卫平) (1):
bonding:reset backup and inactive flag of slave
Stanislaw Gruszka (3):
rt2x00: fix crash in rt2800usb_write_tx_desc
rt2x00: fix order of entry flags modification
rt2x00: fix crash in rt2800usb_get_txwi
Wang Shaoyan (1):
gianfar: reduce stack usage in gianfar_ethtool.c
Willem de Bruijn (3):
net: add missing entries to Documentation/networking/00-INDEX
net: minor update to Documentation/networking/scaling.txt
net: netdev-features.txt update to Documentation/networking/00-INDEX
Documentation/networking/00-INDEX | 116 +++++++++++++++++++++++++++++++
Documentation/networking/ip-sysctl.txt | 2 +-
Documentation/networking/scaling.txt | 23 ++++--
drivers/net/bonding/bond_main.c | 18 +++++
drivers/net/can/sja1000/plx_pci.c | 4 +-
drivers/net/e1000e/e1000.h | 4 +
drivers/net/e1000e/ich8lan.c | 65 ++++++++++++++----
drivers/net/e1000e/netdev.c | 80 ++++++++++++++++++++-
drivers/net/forcedeth.c | 3 +-
drivers/net/gianfar.c | 9 ++-
drivers/net/gianfar_ethtool.c | 26 ++++++--
drivers/net/ixgbe/ixgbe_main.c | 4 +-
drivers/net/sh_eth.c | 1 +
drivers/net/usb/cdc_ncm.c | 47 ++++++++++---
drivers/net/via-velocity.c | 4 -
drivers/net/vmxnet3/vmxnet3_drv.c | 34 +++++----
drivers/net/wireless/iwlwifi/iwl-pci.c | 25 +++----
drivers/net/wireless/rt2x00/rt2800usb.c | 20 ++++--
drivers/net/wireless/rt2x00/rt2x00usb.c | 17 ++---
drivers/net/wireless/wl12xx/acx.c | 6 +--
drivers/net/wireless/wl12xx/testmode.c | 5 +-
net/8021q/vlan_core.c | 2 +
net/atm/br2684.c | 7 +-
net/bridge/br_if.c | 6 ++-
net/ipv6/ipv6_sockglue.c | 9 ++-
net/ipv6/sit.c | 3 +
net/sched/act_mirred.c | 3 +-
27 files changed, 433 insertions(+), 110 deletions(-)
^ permalink raw reply
* [PATCH] bridge: Pseudo-header required for the checksum of ICMP6 header of MLD
From: Ang Way Chuang @ 2011-08-24 4:56 UTC (permalink / raw)
To: netdev
Cc: Eric Dumazet, Linus Lüssing, Herbert Xu, yoshfuji,
Stephen Hemminger
In-Reply-To: <4E53E237.1060401@sfc.wide.ad.jp>
Checksum of ICMPv6 is not properly computed because the pseudo header is not used.
Thus, the MLD packet gets dropped by the bridge. This patch fixes the problem for my
testbed. This bug was made visible by commit ff9a57a62afbbe2d0f3a09af321f1fd7645f38a.
This patch has been tested on 3.0.3. Due to lack of understanding on the checksum
optimization and multicast snooping of the kernel stack, can someone please verify the
correctness of this patch?
Signed-off-by: Ang Way Chuang <wcang@sfc.wide.ad.jp>
---
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 2d85ca7..bbf361b 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1528,9 +1528,12 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br,
break;
/*FALLTHROUGH*/
case CHECKSUM_NONE:
- skb2->csum = 0;
- if (skb_checksum_complete(skb2))
+ if (!skb_csum_unnecessary(skb2) && csum_ipv6_magic(&ip6h->saddr,
+ &ip6h->daddr, skb2->len, IPPROTO_ICMPV6,
+ skb_checksum(skb2, 0, skb2->len, 0))) {
+ err = -EINVAL;
goto out;
+ }
}
err = 0;
---
^ permalink raw reply related
* Re: [PATCH] bridge: Pseudo-header required for the checksum of ICMP6 header of MLD
From: David Miller @ 2011-08-24 5:06 UTC (permalink / raw)
To: wcang; +Cc: netdev, eric.dumazet, linus.luessing, herbert, yoshfuji,
shemminger
In-Reply-To: <4E54846D.10906@sfc.wide.ad.jp>
From: Ang Way Chuang <wcang@sfc.wide.ad.jp>
Date: Wed, 24 Aug 2011 13:56:13 +0900
> @@ -1528,9 +1528,12 @@ static int br_multicast_ipv6_rcv(struct
> net_bridge *br,
> break;
> /*FALLTHROUGH*/
> case CHECKSUM_NONE:
> - skb2->csum = 0;
> - if (skb_checksum_complete(skb2))
> + if (!skb_csum_unnecessary(skb2) && csum_ipv6_magic(&ip6h->saddr,
> + &ip6h->daddr, skb2->len, IPPROTO_ICMPV6,
Patch has been significantly corrupted by your email client, making
it unusable for us.
Please read linux/Documentation/email-clients.txt, email a test patch
to yourself, and only resend your patch to this list once you can
successfully apply such a patch yourself.
^ permalink raw reply
* [PATCH] bridge: fix a possible use after free
From: Eric Dumazet @ 2011-08-24 5:57 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Herbert Xu, Stephen Hemminger
br_multicast_ipv6_rcv() can call pskb_trim_rcsum() and therefore skb
head can be reallocated.
Cache icmp6_type field instead of dereferencing twice the struct
icmp6hdr pointer.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
---
net/bridge/br_multicast.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 2d85ca7..5db95fd 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1456,7 +1456,7 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br,
{
struct sk_buff *skb2;
const struct ipv6hdr *ip6h;
- struct icmp6hdr *icmp6h;
+ u8 icmp6_type;
u8 nexthdr;
unsigned len;
int offset;
@@ -1502,9 +1502,9 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br,
__skb_pull(skb2, offset);
skb_reset_transport_header(skb2);
- icmp6h = icmp6_hdr(skb2);
+ icmp6_type = icmp6_hdr(skb2)->icmp6_type;
- switch (icmp6h->icmp6_type) {
+ switch (icmp6_type) {
case ICMPV6_MGM_QUERY:
case ICMPV6_MGM_REPORT:
case ICMPV6_MGM_REDUCTION:
@@ -1537,7 +1537,7 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br,
BR_INPUT_SKB_CB(skb)->igmp = 1;
- switch (icmp6h->icmp6_type) {
+ switch (icmp6_type) {
case ICMPV6_MGM_REPORT:
{
struct mld_msg *mld;
^ permalink raw reply related
* [PATCH] bridge: Pseudo-header required for the checksum of ICMP6 header of MLD
From: Ang Way Chuang @ 2011-08-24 6:10 UTC (permalink / raw)
To: netdev; +Cc: Eric Dumazet
Just saw Eric's patch for icmp6_type. Suspect this patch may have issue for reference
of ip6h after pskb_trim_rcsum()?
Checksum of ICMPv6 is not properly computed because the pseudo header is not used.
Thus, the MLD packet gets dropped by the bridge. This patch fixes the problem for my
testbed. This bug was made visible by commit ff9a57a62afbbe2d0f3a09af321f1fd7645f38a.
This patch has been tested on 3.0.3. Due to lack of understanding on the checksum
optimization and multicast snooping of the kernel stack, can someone please verify the
correctness of this patch?
Signed-off-by: Ang Way Chuang <wcang@sfc.wide.ad.jp>
---
index 2d85ca7..bbf361b 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1528,9 +1528,12 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br,
break;
/*FALLTHROUGH*/
case CHECKSUM_NONE:
- skb2->csum = 0;
- if (skb_checksum_complete(skb2))
+ if (!skb_csum_unnecessary(skb2) && csum_ipv6_magic(&ip6h->saddr,
+ &ip6h->daddr, skb2->len, IPPROTO_ICMPV6,
+ skb_checksum(skb2, 0, skb2->len, 0))) {
+ err = -EINVAL;
goto out;
+ }
}
err = 0;
---
^ permalink raw reply related
* Re: slow performance on disk/network i/o full speed after drop_caches
From: Pekka Enberg @ 2011-08-24 6:20 UTC (permalink / raw)
To: Stefan Priebe - Profihost AG
Cc: LKML, linux-mm, Andrew Morton, Mel Gorman, Jens Axboe,
Wu Fengguang, Linux Netdev List
In-Reply-To: <4E5494D4.1050605@profihost.ag>
On Wed, Aug 24, 2011 at 9:06 AM, Stefan Priebe - Profihost AG
<s.priebe@profihost.ag> wrote:
> i hope this is the correct list to write to if it would be nice to give me a
> hint where i can ask.
>
> Kernel: 2.6.38
>
> I'm seeing some strange problems on some of our servers after upgrading to
> 2.6.38.
>
> I'm copying a 1GB file via scp from Machine A to Machine B. When B is
> freshly booted the file transfer is done with about 80 to 85 Mb/s. I can
> repeat that various times to performance degrease.
>
> Then after some days copying is only done with about 900kb/s up to 3Mb/s
> going up and down while transfering the file.
>
> When i then do drop_caches it works again on 80Mb/s.
>
> sync && echo 3 >/proc/sys/vm/drop_caches && sleep 2 && echo 0
>>/proc/sys/vm/drop_caches
>
> Attached is also an output of meminfo before and after drop_caches.
>
> What's going on here? MemFree is pretty high.
>
> Please CC me i'm not on list.
Interesting. I can imagine one or more of the following to be
involved: networking, vmscan, block, and writeback. Lets CC all of
them!
> # before drop_caches
>
> # cat /proc/meminfo
> MemTotal: 8185544 kB
> MemFree: 6670292 kB
> Buffers: 105164 kB
> Cached: 166672 kB
> SwapCached: 0 kB
> Active: 728308 kB
> Inactive: 567428 kB
> Active(anon): 639204 kB
> Inactive(anon): 394932 kB
> Active(file): 89104 kB
> Inactive(file): 172496 kB
> Unevictable: 2976 kB
> Mlocked: 2992 kB
> SwapTotal: 1464316 kB
> SwapFree: 1464316 kB
> Dirty: 52 kB
> Writeback: 0 kB
> AnonPages: 1026920 kB
> Mapped: 54208 kB
> Shmem: 8380 kB
> Slab: 80724 kB
> SReclaimable: 22844 kB
> SUnreclaim: 57880 kB
> KernelStack: 2872 kB
> PageTables: 35448 kB
> NFS_Unstable: 0 kB
> Bounce: 0 kB
> WritebackTmp: 0 kB
> CommitLimit: 5557088 kB
> Committed_AS: 6187972 kB
> VmallocTotal: 34359738367 kB
> VmallocUsed: 292360 kB
> VmallocChunk: 34359425327 kB
> HardwareCorrupted: 0 kB
> DirectMap4k: 5632 kB
> DirectMap2M: 2082816 kB
> DirectMap1G: 6291456 kB
>
> # cat /proc/meminfo
> MemTotal: 8185544 kB
> MemFree: 6888060 kB
> Buffers: 372 kB
> Cached: 61492 kB
> SwapCached: 0 kB
> Active: 659156 kB
> Inactive: 426664 kB
> Active(anon): 638892 kB
> Inactive(anon): 395200 kB
> Active(file): 20264 kB
> Inactive(file): 31464 kB
> Unevictable: 2976 kB
> Mlocked: 2992 kB
> SwapTotal: 1464316 kB
> SwapFree: 1464316 kB
> Dirty: 0 kB
> Writeback: 0 kB
> AnonPages: 1026952 kB
> Mapped: 54236 kB
> Shmem: 8316 kB
> Slab: 70616 kB
> SReclaimable: 12264 kB
> SUnreclaim: 58352 kB
> KernelStack: 2864 kB
> PageTables: 35448 kB
> NFS_Unstable: 0 kB
> Bounce: 0 kB
> WritebackTmp: 0 kB
> CommitLimit: 5557088 kB
> Committed_AS: 6187932 kB
> VmallocTotal: 34359738367 kB
> VmallocUsed: 292360 kB
> VmallocChunk: 34359425327 kB
> HardwareCorrupted: 0 kB
> DirectMap4k: 5632 kB
> DirectMap2M: 2082816 kB
> DirectMap1G: 6291456 kB
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply
* $1,000,000.00 Dollars
From: CSBR - Reservations Department @ 2011-08-24 6:37 UTC (permalink / raw)
One Million Dollars have been awarded to you
catholiccharityfunds@yahoo.com
Bali, Mauritius and Goa, India are just three of the new destinations
where you will find a Centara Resort in 2012
More choice in Thailand this winter, with new resorts opening in Krabi,
Pattaya and Khoa lak.
Discover a brand new look to our website from 01 July 2011
Discover them all today at: www.centarahotelsresorts.com
==============================================
Centara Hotels & Resorts
999/99 Rama 1 Road, Pathumwan
Bangkok 10330, Thailand
Tel: +66 (0) 2 769 1234
Fax: +66 (0) 2 769 1235
Email: centara@chr.co.th
For Reservations:
Tel: +66 (0) 2 101 1234, Press 1
Fax: +66 (0) 2 101 1235
Email: reservations@chr.co.th
==============================================
Disclaimer: This e-mail and any files transmitted with it are confidential
and are intended solely for the use of the individual or entity to whom
they are addressed. Unauthorized use, disclosure, copying or alteration
of this message is strictly forbidden. If you have received this e-mail in
error, please notify the sender and delete the e-mail and any copies of
it.Please note that CHR is able to, and reserves the right to, monitor
e-mail communications passing through its network.
==============================================
^ permalink raw reply
* Re: IPv6 multicast snooping behaviour on 2.6.39-rc2 and later
From: Yan, Zheng @ 2011-08-24 7:04 UTC (permalink / raw)
To: Ang Way Chuang; +Cc: Eric Dumazet, netdev, Linus Lüssing, Herbert Xu
In-Reply-To: <4E53E237.1060401@sfc.wide.ad.jp>
On Wed, Aug 24, 2011 at 1:24 AM, Ang Way Chuang <wcang@sfc.wide.ad.jp> wrote:
> This is what I found so far from debugging.
>
> The packet is not forwarded due to the failed checksum at
> br_multicast.c:1533
>
> case CHECKSUM_NONE:
> skb2->csum = 0;
> if (skb_checksum_complete(skb2))
> goto out;
> }
>
> Contrary to description of commit ff9a57a6, when the patch of commit
> ff9a57a6 is applied,
> pskb_trim_rcsum is never called at all on my testbed. When commit ff9a57a6
> is reverted,
> pskb_trim_rcsum will be called. The difference is:
>
> with commit ff9a57a6,
> pskb_trim_rcsum is never called, br_multicast_ipv6_rcv returns -EINVAL
> which causes
> br_handle_frame_finish to drop the packet
>
> without commit ff9a57a6,
> pskb_trim_rcsum is called overwriting err with 0. br_multicast_ipv6_rcv
> still fails on the
> same line (skb_checksum_complete). But the difference is err is set to 0
> this time. Thereby,
> allowing the packet to be forwarded.
>
> Anyway, I don't think the behaviour is correct with or without commit
> ff9a57a6
>
>
Looks like a checksum calculation bug. Please try below patch, Thanks.
---
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 2d85ca7..22d2d1a 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1520,16 +1520,23 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br,
err = pskb_trim_rcsum(skb2, len);
if (err)
goto out;
+ err = -EINVAL;
}
+ ip6h = ipv6_hdr(skb2);
+
switch (skb2->ip_summed) {
case CHECKSUM_COMPLETE:
- if (!csum_fold(skb2->csum))
+ if (!csum_ipv6_magic(&ip6h->saddr, &ip6h->daddr, skb2->len,
+ IPPROTO_ICMPV6, skb2->csum))
break;
/*FALLTHROUGH*/
case CHECKSUM_NONE:
- skb2->csum = 0;
- if (skb_checksum_complete(skb2))
+ skb2->csum = ~csum_unfold(csum_ipv6_magic(&ip6h->saddr,
+ &ip6h->daddr,
+ skb2->len,
+ IPPROTO_ICMPV6, 0));
+ if (__skb_checksum_complete(skb2))
goto out;
}
---
^ permalink raw reply related
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