Linus Torvalds
6843cc0e0f
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
...
Pull networking fixes from David Miller:
1) Fix regression allowing IP_TTL setting of zero, fix from Cong Wang.
2) Fix leak regressions in tunap, from Jason Wang.
3) be2net driver always returns IRQ_HANDLED in INTx handler, fix from
Sathya Perla.
4) qlge doesn't really support NETIF_F_TSO6, don't set that flag. Fix
from Amerigo Wang.
5) Add 802.11ad Atheros wil6210 driver, from Vladimir Kondratiev.
6) Fix MTU calculations in mac80211 layer, from T Krishna Chaitanya.
7) Station info layer of mac80211 needs to use del_timer_sync(), from
Johannes Berg.
8) tcp_read_sock() can loop forever, because we don't immediately stop
when recv_actor() returns zero. Fix from Eric Dumazet.
9) Fix WARN_ON() in tcp_cleanup_rbuf(). We have to use sk_eat_skb() in
tcp_recv_skb() to handle the case where a large GRO packet is split
up while it is use by a splice() operation. Fix also from Eric
Dumazet.
10) addrconf_get_prefix_route() in ipv6 tests flags incorrectly, it
does:
if (X && (p->flags & Y) != 0)
when it really meant to go:
if (X && (p->flags & X) != 0)
fix from Romain Kuntz.
11) Fix lost Kconfig dependency for bfin_mac driver hardware
timestamping. From Lars-Peter Clausen.
12) Fix regression in handling of RST without ACK in TCP, from Eric
Dumazet.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (37 commits)
be2net: fix unconditionally returning IRQ_HANDLED in INTx
tuntap: fix leaking reference count
tuntap: forbid calling TUNSETIFF when detached
tuntap: switch to use rtnl_dereference()
net, wireless: overwrite default_ethtool_ops
qlge: remove NETIF_F_TSO6 flag
tcp: accept RST without ACK flag
net: ethernet: xilinx: Do not use NO_IRQ in axienet
net: ethernet: xilinx: Do not use axienet on PPC
bnx2x: Allow management traffic after boot from SAN
bnx2x: Fix fastpath structures when memory allocation fails
bfin_mac: Restore hardware time-stamping dependency on BF518
tun: avoid owner checks on IFF_ATTACH_QUEUE
bnx2x: move debugging code before the return
tuntap: refuse to re-attach to different tun_struct
ipv6: use addrconf_get_prefix_route for prefix route lookup [v2]
ipv6: fix the noflags test in addrconf_get_prefix_route
tcp: fix splice() and tcp collapsing interaction
tcp: splice: fix an infinite loop in tcp_read_sock()
net: prevent setting ttl=0 via IP_TTL
...
2013-01-14 08:27:10 -08:00
Chen Gang
a8906b0b67
MAINTAINERS: Omar had moved
...
Signed-off-by: Chen Gang <gang.chen@asianux.com >
Cc: Omar Ramirez Luna <omar.ramirez@ti.com >
Cc: Omar Ramirez Luna <omar.ramirez@copitl.com >
Cc: David Miller <davem@davemloft.net >
Cc: Greg KH <gregkh@linuxfoundation.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2013-01-11 14:54:56 -08:00
Zhang Yanfei
56ca9d9877
MAINTAINERS: fix a status pattern
...
Change MAINTAINED to Maintained.
Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2013-01-11 14:54:55 -08:00
Zhang Yanfei
8fc8b12be1
MAINTAINERS: fix arch/arm/plat-omap/include/plat/omap_hwmod.h
...
This file was moved to arch/arm/mach-omap2/omap=5Fhwmod.h by commit
2a296c8f89 ("ARM: OMAP: Make plat/omap=5Fhwmod.h local to
mach-omap2").
Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2013-01-11 14:54:55 -08:00
John W. Linville
a9b8a894ad
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2013-01-09 11:01:37 -05:00
Matthew Garrett
f7cb13b3f2
Update MAINTAINERS entry
...
New job, new address.
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com >
2013-01-07 12:33:42 -05:00
Lee, Chun-Yi
182ae55c12
MAINTAINERS: change the mail address of acer-wmi/msi-laptop maintainer
...
Due to I moved to use suse.com mail address, so, add patch to change the
mail address in MAINTAINERS file.
Cc: Matthew Garrett <mjg@redhat.com >
Signed-off-by: Lee, Chun-Yi <jlee@suse.com >
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com >
2013-01-07 12:31:17 -05:00
Cesar Eduardo Barros
9df0a24510
MAINTAINERS: fix drivers/staging/sm7xx/
...
This directory was moved to drivers/staging/sm7xxfb/ by commit
925aa6600c ("staging: sm7xxfb: sm7xx becomes sm7xxfb").
Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net >
Cc: Teddy Wang <teddy.wang@siliconmotion.com.cn >
Acked-by: Javier Muñoz <jmunhoz@igalia.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2013-01-04 16:11:48 -08:00
Cesar Eduardo Barros
dd72d04a6d
MAINTAINERS: remove include/linux/of_pwm.h
...
Added by commit 200efedd87 ("pwm: Take over maintainership of the PWM
subsystem"), but I could not find any trace of that file being ever
added to the repository.
Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net >
Acked-by: Thierry Reding <thierry.reding@avionic-design.de >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2013-01-04 16:11:48 -08:00
Cesar Eduardo Barros
7b7b8cfbe1
MAINTAINERS: remove arch/*/lib/perf_event*.c
...
This pattern only matched arch/frv/lib/perf_event.c, which was removed
by commit e360adbe29 ("irq_work: Add generic hardirq context
callbacks").
Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net >
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl >
Cc: Paul Mackerras <paulus@samba.org >
Cc: Ingo Molnar <mingo@redhat.com >
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2013-01-04 16:11:48 -08:00
Cesar Eduardo Barros
b3c3d18cac
MAINTAINERS: remove drivers/mmc/host/imxmmc.*
...
This driver was removed by commit 6187fee46f ("mmc: remove imxmmc
driver").
Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net >
Cc: Sascha Hauer <s.hauer@pengutronix.de >
Acked-by: Pavel Pisa <pisa@cmp.felk.cvut.cz >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2013-01-04 16:11:47 -08:00
Cesar Eduardo Barros
e07950a188
MAINTAINERS: fix Documentation/mei/
...
The documentation was moved to Documentation/misc-devices/mei/ instead.
Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net >
Acked-by: Tomas Winkler <tomas.winkler@intel.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2013-01-04 16:11:47 -08:00
Cesar Eduardo Barros
8893bd03f8
MAINTAINERS: remove arch/x86/platform/mrst/pmu.*
...
These files were removed by commit 1a8359e411 ("x86/mid: Remove Intel
Moorestown").
Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net >
Cc: Alan Cox <alan@linux.intel.com >
Cc: Len Brown <len.brown@intel.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2013-01-04 16:11:47 -08:00
Cesar Eduardo Barros
2fbae2c214
MAINTAINERS: remove firmware/isci/
...
This directory was removed by commit 7d99b3abaf ("isci, firmware:
Remove isci fallback parameter blob and generator").
Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net >
Cc: Ben Hutchings <ben@decadent.org.uk >
Cc: Dan Williams <dan.j.williams@intel.com >
Cc: James Bottomley <JBottomley@Parallels.com >
Cc: Intel SCU Linux support <intel-linux-scu@intel.com >
Cc: Lukasz Dorau <lukasz.dorau@intel.com >
Cc: Maciej Patelczyk <maciej.patelczyk@intel.com >
Cc: Dave Jiang <dave.jiang@intel.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2013-01-04 16:11:47 -08:00
Cesar Eduardo Barros
251741b130
MAINTAINERS: fix drivers/ieee802154/
...
This directory was moved to drivers/net/ieee802154/ by commit
31d178bffc ("drivers/ieee802154: move ieee802154 drivers to net
folder").
Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net >
Cc: Alexander Smirnov <alex.bluesman.smirnov@gmail.com >
Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2013-01-04 16:11:47 -08:00
Cesar Eduardo Barros
bad985a16f
MAINTAINERS: fix .../plat-mxc/include/mach/imxfb.h
...
This file was moved to include/linux/platform_data/video-imxfb.h by
commit 82906b13a6 ("ARM: imx: move platform_data definitions").
Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net >
Acked-by: Sascha Hauer <s.hauer@pengutronix.de >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2013-01-04 16:11:47 -08:00
Cesar Eduardo Barros
8e71bde9eb
MAINTAINERS: remove drivers/video/epson1355fb.c
...
This driver was removed by commit 1c3a918f78 ("ARM: clps711x: Remove
board support for CEIVA").
Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net >
Cc: Christopher Hoover <ch@murgatroid.com >
Cc: Christopher Hoover <ch@hpl.hp.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2013-01-04 16:11:47 -08:00
Cesar Eduardo Barros
9819da66c8
MAINTAINERS: fix drivers/media/usb/dvb-usb/cxusb*
...
This driver was never at dvb-usb-v2, as far as I could see.
Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net >
Cc: Michael Krufky <mkrufky@linuxtv.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2013-01-04 16:11:47 -08:00
Cesar Eduardo Barros
c117ab8420
MAINTAINERS: adjust for UAPI
...
Several headers were moved or split to uapi/.
Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net >
Acked-by: David Howells <dhowells@redhat.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2013-01-04 16:11:47 -08:00
Cesar Eduardo Barros
f2294c2d66
MAINTAINERS: fix drivers/media/platform/atmel-isi.c
...
This file was moved to drivers/media/platform/soc_camera/atmel-isi.c by
commit b47ff4a3ed ("[media] move soc_camera to its own directory").
Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net >
Cc: Mauro Carvalho Chehab <mchehab@redhat.com >
Cc: Josh Wu <josh.wu@atmel.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2013-01-04 16:11:47 -08:00
Cesar Eduardo Barros
6f0d65afd4
MAINTAINERS: fix arch/arm/mach-at91/include/mach/at_hdmac.h
...
This file was moved to include/linux/platform_data/dma-atmel.h by commit
7cdc39eead ("ARM: at91: move platform_data definitions").
Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net >
Cc: Nicolas Ferre <nicolas.ferre@atmel.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2013-01-04 16:11:47 -08:00
Cesar Eduardo Barros
7beefe1dd8
MAINTAINERS: fix drivers/rtc/rtc-vt8500.c
...
Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net >
Cc: Tony Prisk <linux@prisktech.co.nz >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2013-01-04 16:11:46 -08:00
Cesar Eduardo Barros
934455d7af
MAINTAINERS: remove arch/arm/plat-s5p/
...
These files were merged into plat-samsung.
Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net >
Cc: Ben Dooks <ben-linux@fluff.org >
Acked-by: Kukjin Kim <kgene.kim@samsung.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2013-01-04 16:11:46 -08:00
Cesar Eduardo Barros
7101b795f3
MAINTAINERS: remove arch/arm/common/time-acorn.c
...
This file was moved to arch/arm/mach-rpc/time.c by commit a1be5d6496
("ARM: riscpc: move time-acorn.c to mach-rpc"), and the pattern for
arch/arm/mach-rpc/ already exists.
Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net >
Cc: Russell King <linux@arm.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2013-01-04 16:11:46 -08:00
Cesar Eduardo Barros
5eebebee84
MAINTAINERS: remove drivers/platform/msm/
...
This subdirectory entry was added by commit 8a5700cd67 ("MAINTAINERS:
add drivers/platform/msm to MSM subsystem") back in 2011, but I could
not find any trace of that directory being ever added to the repository.
Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net >
Cc: Kenneth Heitke <kheitke@codeaurora.org >
Acked-by: David Brown <davidb@codeaurora.org >
Cc: Daniel Walker <dwalker@fifo99.com >
Cc: Bryan Huntsman <bryanh@codeaurora.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2013-01-04 16:11:46 -08:00