26 Jan, 2007
1 commit
-
Revert 931731123a103cfb3f70ac4b7abfc71d94ba1f03
We can't elide the skb_set_owner_w() here because things like certain
netfilter targets (such as owner MATCH) need a socket to be set on the
SKB for correct operation.Thanks to Jan Engelhardt and other netfilter list members for
pointing this out.Signed-off-by: David S. Miller
24 Jan, 2007
2 commits
-
Consider the chunk as Out-of-the-Blue if we don't have
an endpoint. Otherwise discard it as before.Signed-off-by: Vlad Yasevich
Signed-off-by: Sridhar Samudrala
Signed-off-by: David S. Miller -
In file included from net/netfilter/xt_state.c:13:
include/net/netfilter/nf_conntrack_compat.h: In function 'nf_ct_l3proto_try_module_get':
include/net/netfilter/nf_conntrack_compat.h:70: error: 'PF_INET' undeclared (first use in this function)
include/net/netfilter/nf_conntrack_compat.h:70: error: (Each undeclared identifier is reported only once
include/net/netfilter/nf_conntrack_compat.h:70: error: for each function it appears in.)
include/net/netfilter/nf_conntrack_compat.h:71: warning: control reaches end of non-void function
make[2]: *** [net/netfilter/xt_state.o] Error 1
make[1]: *** [net/netfilter] Error 2
make: *** [net] Error 2A simple fix is to have nf_conntrack_compat.h #include .
Signed-off-by: Mikael Pettersson
Signed-off-by: Patrick McHardy
Signed-off-by: David S. Miller
08 Jan, 2007
1 commit
-
…ville/wireless-2.6 into upstream-fixes
05 Jan, 2007
1 commit
-
This reverts the new (unambiguous) definition of the TCP `before'
relation. As pointed out in an example by Herbert Xu, there is
existing code which implicitly requires the old definition in order
to work correctly.Signed-off-by: Gerrit Renker
Signed-off-by: David S. Miller
04 Jan, 2007
1 commit
-
This patch adds a proper prototype for x25_init_timers() in
include/net/x25.hSigned-off-by: Adrian Bunk
Signed-off-by: David S. Miller
03 Jan, 2007
1 commit
-
The WLAN_GET_SEQ_SEQ(seq) macro in ieee80211 is selecting the wrong region.
Signed-off-by: Zhu Yi
Signed-off-by: John W. Linville
23 Dec, 2006
4 commits
-
... duh
Signed-off-by: Al Viro
Signed-off-by: David S. Miller -
This patch makes the following needlessly global functions static:
- ipv6.c: sctp_inet6addr_event()
- protocol.c: sctp_inetaddr_event()Signed-off-by: Adrian Bunk
Signed-off-by: Sridhar Samudrala
Signed-off-by: David S. Miller -
Signed-off-by: Ivan Skytte Jorgensen
Signed-off-by: Sridhar Samudrala
Signed-off-by: David S. Miller -
While looking at DCCP sequence numbers, I stumbled over a problem with
the following definition of before in tcp.h:static inline int before(__u32 seq1, __u32 seq2)
{
return (__s32)(seq1-seq2) < 0;
}Problem: This definition suffers from an an ambiguity, i.e. always
before(a, (a + 2^31) % 2^32)) = 1
before((a + 2^31) % 2^32), a) = 1In text: when the difference between a and b amounts to 2^31,
a is always considered `before' b, the function can not decide.
The reason is that implicitly 0 is `before' 1 ... 2^31-1 ... 2^31Solution: There is a simple fix, by defining before in such a way that
0 is no longer `before' 2^31, i.e. 0 `before' 1 ... 2^31-1
By not using the middle between 0 and 2^32, before can be made
unambiguous.
This is achieved by testing whether seq2-seq1 > 0 (using signed
32-bit arithmetic).I attach a patch to codify this. Also the `after' relation is basically
a redefinition of `before', it is now defined as a macro after before.Signed-off-by: Gerrit Renker
Signed-off-by: David S. Miller
18 Dec, 2006
4 commits
-
rose_add_loopback_neigh uses kmalloc and the callers were ignoring the
error value. Rewrite to let the caller deal with the allocation. This
allows the use of static allocation of kmalloc use entirely.Signed-off-by: Ralf Baechle
Signed-off-by: David S. Miller -
ax25_linkfail_register uses kmalloc and the callers were ignoring the
error value. Rewrite to let the caller deal with the allocation. This
allows the use of static allocation of kmalloc use entirely.Signed-off-by: Ralf Baechle
Signed-off-by: David S. Miller -
Replace ax25_protocol_register by ax25_register_pid which assumes the
caller has done the memory allocation. This allows replacing the
kmalloc allocations entirely by static allocations.Signed-off-by: Ralf Baechle
Signed-off-by: David S. Miller -
The recent fix 0506d4068bad834aab1141b5dc5e748eb175c6b3 made obvious that
error values were not being propagated through the AX.25 stack. To help
with that this patch marks all kmalloc users in the AX.25, NETROM and
ROSE stacks as __must_check.Signed-off-by: Ralf Baechle
Signed-off-by: David S. Miller
14 Dec, 2006
5 commits
-
Make fib6_node 'subtree' depend on IPV6_SUBTREES.
Signed-off-by: Kim Nordlund
Signed-off-by: David S. Miller -
Signed-off-by: Ivan Skytte Jorgensen
Signed-off-by: Sridhar Samudrala
Signed-off-by: David S. Miller -
Currently in SCTP, we maintain a local address list by rebuilding the whole
list from the device list whenever we get a address add/delete event.This patch fixes it by only adding/deleting the address for which we
receive the event.Also removed the sctp_local_addr_lock() which is no longer needed as we
now use list_for_each_safe() to traverse this list. This fixes the bugs
in sctp_copy_laddrs_xxx() routines where we do copy_to_user() while
holding this lock.Signed-off-by: Sridhar Samudrala
Signed-off-by: David S. Miller -
To do that, this makes nf_ct_l3proto_try_module_{get,put} compatible
functions. As a result we can remove '#ifdef' surrounds and direct call of
need_conntrack().Signed-off-by: Yasuyuki Kozakai
Signed-off-by: Patrick McHardy
Signed-off-by: David S. Miller -
Signed-off-by: Al Viro
Acked-by: Marcel Holtmann
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
12 Dec, 2006
1 commit
-
Fix foobar in 15b1c0e822f578306332d4f4c449250db5c5dceb and
e8cc49bb0fdb9e18a99e6780073d1400ba2b0d1f patch series.Signed-off-by: Ralf Baechle
Signed-off-by: David S. Miller
11 Dec, 2006
1 commit
-
Signed-off-by: Alexey Dobriyan
Cc: Andi Kleen
Cc: "David S. Miller"
Cc: David Howells
Cc: Ralf Baechle
Cc: "Eric W. Biederman"
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
09 Dec, 2006
4 commits
-
Only the callsign but not the SSID part of an AX.25 address is ASCII
based but Linux by initializes the SSID which should be just a 4-bit
number from ASCII anyway.Fix that and convert the code to use a shared constant for both default
addresses. While at it, use the same style for null_ax25_address also.Signed-off-by: Ralf Baechle
Signed-off-by: David S. Miller -
Signed-off-by: Ralf Baechle
Signed-off-by: David S. Miller -
The hard header cache is in the main output path, so using
seqlock instead of reader/writer lock should reduce overhead.Signed-off-by: Stephen Hemminger
Signed-off-by: David S. Miller -
This is the core of the switch to the new framework. I've split it from the
driver patches which are mostly search/replace and would encourage people to
give this one a good hard stare.The references to BOTHER and ISHIFT are the termios values that must be
defined by a platform once it wants to turn on "new style" ioctl support. The
code patches here ensure that providing1. The termios overlays the ktermios in memory
2. The only new kernel only fields are c_ispeed/c_ospeed (or none)the existing behaviour is retained. This is true for the patches at this
point in time.Future patches will define BOTHER, ISHIFT and enable newer termios structures
for each architecture, and once they are all done some of the ifdefs also
vanish.[akpm@osdl.org: warning fix]
[akpm@osdl.org: IRDA fix]
Signed-off-by: Alan Cox
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
08 Dec, 2006
4 commits
-
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (48 commits)
[NETFILTER]: Fix non-ANSI func. decl.
[TG3]: Identify Serdes devices more clearly.
[TG3]: Use msleep.
[TG3]: Use netif_msg_*.
[TG3]: Allow partial speed advertisement.
[TG3]: Add TG3_FLG2_IS_NIC flag.
[TG3]: Add 5787F device ID.
[TG3]: Fix Phy loopback.
[WANROUTER]: Kill kmalloc debugging code.
[TCP] inet_twdr_hangman: Delete unnecessary memory barrier().
[NET]: Memory barrier cleanups
[IPSEC]: Fix inetpeer leak in ipv4 xfrm dst entries.
audit: disable ipsec auditing when CONFIG_AUDITSYSCALL=n
audit: Add auditing to ipsec
[IRDA] irlan: Fix compile warning when CONFIG_PROC_FS=n
[IrDA]: Incorrect TTP header reservation
[IrDA]: PXA FIR code device model conversion
[GENETLINK]: Fix misplaced command flags.
[NETLIK]: Add a pointer to the Generic Netlink wiki page.
[IPV6] RAW: Don't release unlocked sock.
... -
Stick NFS sockets in their own class to avoid some lockdep warnings. NFS
sockets are never exposed to user-space, and will hence not trigger certain
code paths that would otherwise pose deadlock scenarios.[akpm@osdl.org: cleanups]
Signed-off-by: Peter Zijlstra
Signed-off-by: Steven Dickson
Acked-by: Ingo Molnar
Cc: Trond Myklebust
Acked-by: Neil Brown
Cc: "David S. Miller"
Signed-off-by: Andrew Morton
[ Fixed patch corruption by quilt, pointed out by Peter Zijlstra ]
Signed-off-by: Linus Torvalds -
Replace all uses of kmem_cache_t with struct kmem_cache.
The patch was generated using the following script:
#!/bin/sh
#
# Replace one string by another in all the kernel sources.
#set -e
for file in `find * -name "*.c" -o -name "*.h"|xargs grep -l $1`; do
quilt add $file
sed -e "1,\$s/$1/$2/g" $file >/tmp/$$
mv /tmp/$$ $file
quilt refresh
doneThe script was run like this
sh replace kmem_cache_t "struct kmem_cache"
Signed-off-by: Christoph Lameter
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
SLAB_ATOMIC is an alias of GFP_ATOMIC
Signed-off-by: Christoph Lameter
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
07 Dec, 2006
3 commits
-
Disables auditing in ipsec when CONFIG_AUDITSYSCALL is
disabled in the kernel.Also includes a bug fix for xfrm_state.c as a result of
original ipsec audit patch.Signed-off-by: Joy Latten
Signed-off-by: James Morris
Signed-off-by: David S. Miller -
An audit message occurs when an ipsec SA
or ipsec policy is created/deleted.Signed-off-by: Joy Latten
Signed-off-by: James Morris
Signed-off-by: David S. Miller -
include/net/irda/irlan_filter.h:31: warning: 'struct seq_file' declared inside parameter list
include/net/irda/irlan_filter.h:31: warning: its scope is only this definition or declaration, which is probably not what you wantSigned-off-by: Randy Dunlap
Signed-off-by: David S. Miller
06 Dec, 2006
1 commit
-
Conflicts:
drivers/ata/libata-scsi.c
include/linux/libata.hFuther merge of Linus's head and compilation fixups.
Signed-Off-By: David Howells
05 Dec, 2006
1 commit
-
Conflicts:
drivers/infiniband/core/iwcm.c
drivers/net/chelsio/cxgb2.c
drivers/net/wireless/bcm43xx/bcm43xx_main.c
drivers/net/wireless/prism54/islpci_eth.c
drivers/usb/core/hub.h
drivers/usb/input/hid-core.c
net/core/netpoll.cFix up merge failures with Linus's head and fix new compilation failures.
Signed-Off-By: David Howells
04 Dec, 2006
2 commits
-
Signed-off-by: Al Viro
-
Signed-off-by: Al Viro
03 Dec, 2006
3 commits
-
Add nf_conntrack port of the PPtP conntrack/NAT helper. Since there seems
to be no IPv6-capable PPtP implementation the helper only support IPv4.Signed-off-by: Patrick McHardy
Signed-off-by: David S. Miller -
Add IPv4 and IPv6 capable nf_conntrack port of the H.323 conntrack/NAT helper.
Signed-off-by: Patrick McHardy
Signed-off-by: David S. Miller -
Expectation address masks need to be differently initialized depending
on the address family, create helper function to avoid cluttering up
the code too much.Signed-off-by: Patrick McHardy
Signed-off-by: David S. Miller