Author: Date: Subject:
David Miller
2008-04-19 21:38:42
[GIT]: Networking
This fixes various small bits of build fallout, integrates some ATM
and hci_usb bluetooth cleanup/fixup patches that came in via Andrew, a
ROSE locking bug fix, and a tg3 driver DMA data corruption fix.
Please pull, thanks a lot!
The following changes since commit 3925e6fc1f774048404fdd910b0345b06c699eb4:
Linus Torvalds (1):
Merge branch 'for-linus' of git://git.kernel.org/.../jmorris/security-testing-2.6
are available in the git repository at:
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master
Bernard Pidoux (1):
rose: Socket lock was not released before returning to user space
David S. Miller (1):
iwlwifi: Fix unconditional access to station->tidp[].agg.
Julia Lawall (2):
drivers/atm: use time_before, time_before_eq, etc
drivers/net/appletalk: use time_before, time_before_eq, etc
Mark Asselstine (1):
atm nicstar: Removal of debug code containing deprecated calls to cli()/sti()
Matt Carlson (1):
tg3: 5701 DMA corruption fix
Patrick McHardy (2):
netfilter: Fix SCTP nat build.
netfilter: Fix SIP conntrack build with NAT disabled.
Pavel Machek (2):
hci_usb: do not initialize static variables to 0
hci_usb: remove code obfuscation
drivers/atm/iphase.c | 7 +-
drivers/atm/nicstar.c | 117 +++++-----------------------
drivers/atm/nicstar.h | 12 ---
drivers/bluetooth/hci_usb.c | 24 +++---
drivers/bluetooth/hci_usb.h | 5 -
drivers/net/appletalk/cops.c | 3 +-
drivers/net/tg3.c | 52 +++++++++++-
drivers/net/tg3.h | 1 +
drivers/net/wireless/iwlwifi/iwl-debugfs.c | 18 +++--
net/ipv4/netfilter/Kconfig | 1 +
net/netfilter/nf_conntrack_sip.c | 3 +-
net/rose/af_rose.c | 6 +-
12 files changed, 105 insertions(+), 144 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Author: Date: Subject:
David Miller
2008-04-23 05:53:43
[GIT]: Networking
This has cures for several build failures, including the one you
reported yesterday with the iwlwifi driver Linus:
1) Fix iwlcore.o link, fix from Tomas Winkler.
2) iwlwifi and rt2x00 build can break because they use depends on
LEDS_CLASS instead of select, remove bogus HAS_IOMEM guard to
NEW_LEDS to facilitate that.
3) rose_node_list_lock is taken when it isn't even needed, resulting
in lockups, fix by Bernard Pidoux.
4) If we expose the network device "dev_id", things like udev
can use it to distinguish unique network devices that are
otherwise indistinguishable.
5) Fix issue with enabling crypto algorithms with IDs > 31 in
IPSEC, from Herbert Xu.
6) Network namespace race bug fixes for ipv6, and some minor cleanups
by Pavel Emelyanov.
7) Kernel doc fix for struct sk_buff from Randy Dunlap.
8) TCP comment typo fix from Satoru SATOH.
9) IPV4 and DCCP call do_gettimeofday() then do conversions back,
which are silly, these things can just call getnstimeofday()
directly and avoid all of that fuss. From YOSHIFUJI Hideaki.
10) TCP has open-coded test equivalen to before() macro, use it.
From Arnd Hannemann.
11) The Solaris/SunOS syscall support removal changeset allows
several networking exports to be removed, from Adrian Bunk.
Please pull, thanks a lot!
The following changes since commit 43837b1e6c5aef803d57009a68db18df13e64892:
Bernard Pidoux (1):
rose: Socket lock was not released before returning to user space
are available in the git repository at:
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master
Adrian Bunk (3):
[IPV6]: Make struct ip6_prohibit_entry_template static.
[IPV4]: Make icmp_sk_init() static.
net: Unexport move_addr_to_{kernel,user}
Arnd Hannemann (1):
tcp: Make use of before macro in tcp_input.c
Bernard Pidoux (1):
[ROSE]: Fix soft lockup wrt. rose_node_list_lock
David S. Miller (3):
leds: Do not guard NEW_LEDS with HAS_IOMEM
iwlwifi: Select LEDS_CLASS.
rt2x00: Select LEDS_CLASS.
David Woodhouse (1):
[NET]: Expose netdevice dev_id through sysfs
Herbert Xu (1):
[IPSEC]: Fix catch-22 with algorithm IDs above 31
Mark Asselstine (1):
hamradio: Remove unneeded and deprecated cli()/sti() calls in dmascc.c
Pavel Emelyanov (3):
[NETNS]: The ip6_fib_timer can work with garbage on net namespace stop.
[NETNS]: Don't initialize err variable twice.
[NETNS]: Remove empty ->init callback.
Randy Dunlap (1):
skbuff: fix missing kernel-doc notation
Satoru SATOH (1):
tcp: Trivial fix to correct function name in a comment in net/ipv4/tcp.c
Tomas Winkler (1):
iwlwifi: Fix built-in compilation of iwlcore
YOSHIFUJI Hideaki (3):
[IPV4]: Convert do_gettimeofday() to getnstimeofday().
[DCCP]: Convert do_gettimeofday() to getnstimeofday().
time: Export set_normalized_timespec.
drivers/leds/Kconfig | 1 -
drivers/net/hamradio/dmascc.c | 3 ---
drivers/net/wireless/iwlwifi/Kconfig | 8 ++++++--
drivers/net/wireless/iwlwifi/Makefile | 2 +-
drivers/net/wireless/rt2x00/Kconfig | 15 ++++++++++-----
include/linux/skbuff.h | 1 +
include/net/xfrm.h | 3 +++
kernel/time.c | 1 +
net/core/net-sysfs.c | 2 ++
net/dccp/probe.c | 17 ++++++-----------
net/ipv4/icmp.c | 10 +++++-----
net/ipv4/ip_options.c | 12 ++++++------
net/ipv4/tcp.c | 2 +-
net/ipv4/tcp_input.c | 2 +-
net/ipv6/addrconf.c | 7 -------
net/ipv6/ip6_fib.c | 2 +-
net/ipv6/route.c | 5 ++---
net/key/af_key.c | 2 +-
net/rose/rose_route.c | 2 --
net/socket.c | 3 ---
net/xfrm/xfrm_policy.c | 2 +-
net/xfrm/xfrm_user.c | 2 ++
22 files changed, 50 insertions(+), 54 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Author: Date: Subject:
David Miller
2008-04-24 04:06:58
[GIT]: networking
Networking updates:
1) Really really fix the build of iwlwifi when built non-modular,
from Zhu Yi.
2) Several wireless bug fixes via John Linville's wireless tree.
3) Initialize AF_UNIX earlier to try and solve some MTD partition
module loading issues, from David Woodhouse.
4) Alan Cox noticed some locking problems in the TUN driver ioctl()
handler, fixed by your's truly.
5) PPP driver can use the generic statistics area in the generic
netdev structure, instead of it's own copy.
6) Several seq_file output routines in the networking use a large
(~128 byte) on-stack structure, which is totally unnecessary
if we use "%n" properly. From Pavel Emelyanov, based upon suggestions
by Al Viro and initial patches by Yoshifuji HIDEAKI.
7) Kill erroneous lockdep warnings generated by ASSERT_RTNL, from
Patrick McHardy.
Please pull, thanks a lot!
The following changes since commit d7d313000ba2fc94a5383511a17ff38a39bab928:
Tomas Winkler (1):
iwlwifi: Fix built-in compilation of iwlcore
are available in the git repository at:
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master
Abhijeet Kolekar (1):
mac80211: Fix n-band association problem
Adrian Bunk (1):
net/mac80211/rx.c: fix off-by-one
David S. Miller (3):
tun: Fix minor race in TUNSETLINK ioctl handling.
Merge branch 'master' of master.kernel.org:/.../linville/wireless-2.6
tun: Multicast handling in tun_chr_ioctl() needs proper locking.
David Woodhouse (1):
[AF_UNIX] Initialise UNIX sockets before general device initcalls
Johannes Berg (1):
mac80211: MAINTAINERS update
Larry Finger (1):
ssb: Fix all-ones boardflags
Luis Carlos Cobo (1):
mac80211: update mesh EID values
Michael Buesch (4):
b43: Workaround invalid bluetooth settings
b43: Fix HostFlags data types
b43: Add more btcoexist workarounds
b43: Workaround DMA quirks
Nick Kossifidis (1):
ath5k: Fix radio identification on AR5424/2424
Patrick McHardy (1):
[RTNETLINK]: Fix bogus ASSERT_RTNL warning
Paulius Zaleckas (1):
ppp_generic: use stats from net_device structure
Pavel Emelyanov (2):
mac80211: Fix race between ieee80211_rx_bss_put and lookup routines.
[NET]: Fix heavy stack usage in seq_file output routines.
Roel Kluin (2):
prism54: prism54_get_encode() test below 0 on unsigned index
wireless: rndis_wlan: modparam_workaround_interval is never below 0.
Roland Dreier (1):
iwlwifi: Don't unlock priv->mutex if it isn't locked
Ron Rindjunsky (1):
mac80211: fix use before check of Qdisc length
Zhu Yi (1):
iwlwifi: Fix built-in compilation of iwlcore (part 2)
MAINTAINERS | 6 +--
drivers/net/ppp_generic.c | 48 ++++++++++----------------
drivers/net/tun.c | 21 ++++++++++-
drivers/net/wireless/Makefile | 3 +-
drivers/net/wireless/ath5k/hw.c | 14 +++++--
drivers/net/wireless/b43/dma.c | 47 ++++++++++++++++++++++----
drivers/net/wireless/b43/main.c | 32 +++++++++++++++--
drivers/net/wireless/b43/phy.c | 2 +-
drivers/net/wireless/iwlwifi/iwl3945-base.c | 1 -
drivers/net/wireless/iwlwifi/iwl4965-base.c | 1 -
drivers/net/wireless/prism54/isl_ioctl.c | 2 +-
drivers/net/wireless/rndis_wlan.c | 5 ++-
drivers/ssb/pci.c | 5 +++
include/linux/ieee80211.h | 20 +++++++----
include/linux/rtnetlink.h | 4 +-
net/core/rtnetlink.c | 6 +++
net/ipv4/fib_hash.c | 17 +++++----
net/ipv4/fib_trie.c | 18 +++++----
net/ipv4/route.c | 11 +++---
net/ipv4/tcp_ipv4.c | 36 ++++++++++---------
net/ipv4/udp.c | 15 ++++----
net/mac80211/mlme.c | 28 ++++++++++++++--
net/mac80211/rx.c | 2 +-
net/mac80211/wme.c | 2 +-
net/sctp/objcnt.c | 9 ++---
net/unix/af_unix.c | 6 +++-
26 files changed, 237 insertions(+), 124 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
|