23 Mar, 2006
10 commits
-
The problem is in ip_push_pending_frames(), which uses:
if (!df) {
__ip_select_ident(iph, &rt->u.dst, 0);
} else {
iph->id = htons(inet->id++);
}instead of ip_select_ident().
Right now I think the code is a nonsense. Most likely, I copied it from
old ip_build_xmit(), where it was really special, we had to decide
whether to generate unique ID when generating the first (well, the last)
fragment.In ip_push_pending_frames() it does not make sense, it should use plain
ip_select_ident() instead.Signed-off-by: Alexey Kuznetsov
Signed-off-by: David S. Miller -
get_h225_addr is exported, but declared static, which fails when
linking statically.Signed-off-by: Patrick McHardy
Signed-off-by: David S. Miller -
Fix missing inversion in address matching, it was broken during the
conversion to x_tables.Signed-off-by: Patrick McHardy
Signed-off-by: David S. Miller -
x_tables matches and targets that require nf_conntrack_ipv[4|6] to work
don't have enough information to load on demand these modules. This
patch introduces the following changes to solve this issue:o nf_ct_l3proto_try_module_get: try to load the layer 3 connection
tracker module and increases the refcount.
o nf_ct_l3proto_module put: drop the refcount of the module.Signed-off-by: Pablo Neira Ayuso
Signed-off-by: Patrick McHardy
Signed-off-by: David S. Miller -
Set the family field in xt_[matches|targets] registered.
Signed-off-by: Pablo Neira Ayuso
Signed-off-by: Patrick McHardy
Signed-off-by: David S. Miller -
Currently the first conntrack ID assigned is 2, use 1 instead.
Signed-off-by: Pablo Neira Ayuso
Signed-off-by: Patrick McHardy
Signed-off-by: David S. Miller -
Fix oversized message, use NLMSG_SPACE just one since it reserves space
for the netlink header and NFA_SPACE for every attribute.Thanks to Harald Welte for the feedback
Signed-off-by: Pablo Neira Ayuso
Signed-off-by: Patrick McHardy
Signed-off-by: David S. Miller -
The expectation mask has some particularities that requires a different
handling. The protocol number fields can be set to non-valid protocols,
ie. l3num is set to 0xFFFF. Since that protocol does not exist, the mask
tuple will not be dumped. Moreover, this results in a kernel panic when
nf_conntrack accesses the array of protocol handlers, that is PF_MAX (0x1F)
long.This patch introduces the function ctnetlink_exp_dump_mask, that correctly
dumps the expectation mask. Such function uses the l3num value from the
expectation tuple that is a valid layer 3 protocol number. The value of the
l3num mask isn't dumped since it is meaningless from the userspace side.Thanks to Yasuyuki Kozakai and Patrick McHardy for the feedback.
Signed-off-by: Pablo Neira Ayuso
Signed-off-by: Patrick McHardy
Signed-off-by: David S. Miller -
Signed-off-by: Thomas Vögtle
Signed-off-by: Patrick McHardy
Signed-off-by: David S. Miller -
do_ipv6_getsockopt returns -EINVAL for unknown options, not
-ENOPROTOOPT as do_ipv6_setsockopt.Signed-off-by: Patrick McHardy
Signed-off-by: David S. Miller
22 Mar, 2006
7 commits
-
Allows dte facility patch to use 32 64 bit ioctl conversion mechanism
Signed-off-by: Shaun Pereira
Signed-off-by: Andrew Morton
Signed-off-by: David S. Miller -
Allows use of the optional user facility to insert ITU-T
(http://www.itu.int/ITU-T/) specified DTE facilities in call set-up x25
packets. This feature is optional; no facilities will be added if the ioctl
is not used, and call setup packet remains the same as before.If the ioctls provided by the patch are used, then a facility marker will be
added to the x25 packet header so that the called dte address extension
facility can be differentiated from other types of facilities (as described in
the ITU-T X.25 recommendation) that are also allowed in the x25 packet header.Facility markers are made up of two octets, and may be present in the x25
packet headers of call-request, incoming call, call accepted, clear request,
and clear indication packets. The first of the two octets represents the
facility code field and is set to zero by this patch. The second octet of the
marker represents the facility parameter field and is set to 0x0F because the
marker will be inserted before ITU-T type DTE facilities.Since according to ITU-T X.25 Recommendation X.25(10/96)- 7.1 "All networks
will support the facility markers with a facility parameter field set to all
ones or to 00001111", therefore this patch should work with all x.25 networks.While there are many ITU-T DTE facilities, this patch implements only the
called and calling address extension, with placeholders in the
x25_dte_facilities structure for the rest of the facilities.Testing:
This patch was tested using a cisco xot router connected on its serial ports
to an X.25 network, and on its lan ports to a host running an xotd daemon.It is also possible to test this patch using an xotd daemon and an x25tap
patch, where the xotd daemons work back-to-back without actually using an x.25
network. See www.fyonne.net for details on how to do this.Signed-off-by: Shaun Pereira
Acked-by: Andrew Hendry
Signed-off-by: Andrew Morton
Signed-off-by: David S. Miller -
Fixes the following error from kernel
T2 kernel: schedule_timeout:
wrong timeout value ffffffffffffffff from ffffffff88164796Signed-off-by: Shaun Pereira
Acked-by: Arnd Bergmann
Signed-off-by: Andrew Morton
Signed-off-by: David S. Miller -
To allow 32 bit x25 module structures to be passed to a 64 bit kernel via
ioctl using the new compat_sock_ioctl registration mechanism instead of the
obsolete 'register_ioctl32_conversion into hash table' mechanismSigned-off-by: Shaun Pereira
Acked-by: Arnd Bergmann
Signed-off-by: Andrew Morton
Signed-off-by: David S. Miller -
Get socket timestamp handler function that does not use the
ioctl32_hash_table.Signed-off-by: Shaun Pereira
Acked-by: Arnd Bergmann
Signed-off-by: Andrew Morton
Signed-off-by: David S. Miller -
Since the register_ioctl32_conversion() patch in the kernel is now obsolete,
provide another method to allow 32 bit user space ioctls to reach the kernel.Signed-off-by: Shaun Pereira
Acked-by: Arnd Bergmann
Signed-off-by: Andrew Morton
Signed-off-by: David S. Miller -
Return negative error constant.
Signed-off-by: Tobias Klauser
Signed-off-by: Andrew Morton
Signed-off-by: David S. Miller
21 Mar, 2006
23 commits
-
Signed-off-by: Jing Min Zhao
Signed-off-by: Patrick McHardy
Signed-off-by: David S. Miller -
Here are some possible (and trivial) cleanups.
- use kzalloc() where possible
- invert allocation failure test like
if (object) {
/* Rest of function here */
}
toif (object == NULL)
return NULL;/* Rest of function here */
Signed-off-by: Ingo Oeser
Acked-by: YOSHIFUJI Hideaki
Signed-off-by: David S. Miller -
Stupidly use kzalloc() instead of kmalloc()/memset()
everywhere where this is possible in net/ipv6/*.c .Signed-off-by: Ingo Oeser
Signed-off-by: David S. Miller -
Two minor cleanups:
1. Using kzalloc() in fraq_alloc_queue()
saves the memset() in ipv6_frag_create().2. Invert sense of if-statements to streamline code.
Inverts the comment, too.Signed-off-by: Ingo Oeser
Signed-off-by: David S. Miller -
Signed-off-by: Andrew Morton
Signed-off-by: David S. Miller -
The Coverity checker noted this inconsequent NULL checking in
dnrt_drop().Since all callers ensure that NULL isn't passed, we can simply remove
the check.Signed-off-by: Adrian Bunk
Signed-off-by: David S. Miller -
The bridge code can use existing LLC output code when building
spanning tree protocol packets.Signed-off-by: Stephen Hemminger
Signed-off-by: David S. Miller -
Cleanup of LLC. llc_mac_hdr_init can take constant arguments,
and it is defined twice once in llc_output.h that is otherwise unused.Signed-off-by: Stephen Hemminger
Acked-by: Arnaldo Carvalho de Melo
Signed-off-by: David S. Miller -
Bridge's communicate with each other using Spanning Tree Protocol
over a standard multicast address. There are times when testing or
layering bridges over existing topologies or tunnels, when it is
useful to use alternative multicast addresses for STP packets.The 802.1d standard has some unused addresses, that can be used for this.
This patch is restrictive in that it only allows one of the possible
addresses in the standard.Signed-off-by: Stephen Hemminger
Signed-off-by: David S. Miller -
Use LLC for the receive path of Spanning Tree Protocol packets.
This allows link local multicast packets to be received by
other protocols (if they care), and uses the existing LLC
code to get STP packets back into bridge code.The bridge multicast address is also checked, so bridges using
other link local multicast addresses are ignored. This allows
for use of different multicast addresses to define separate STP
domains.Signed-off-by: Stephen Hemminger
Signed-off-by: David S. Miller -
Cleanup the get/set of bridge timer value in the packets.
It is clearer not to bury the conversion in macro.Signed-off-by: Stephen Hemminger
Signed-off-by: David S. Miller -
Optimize the forwarding and transmit paths. Both places are
called with bottom half/no preempt so there is no need to use
spin_lock_bh or rcu_read_lock.Signed-off-by: Stephen Hemminger
Signed-off-by: David S. Miller -
Move nf_bridge_alloc from header file to the one place it is
used and optimize it.Signed-off-by: Stephen Hemminger
Signed-off-by: David S. Miller -
Fix the VLAN macros in bridge netfilter code. Macros should
not depend on magic variables.Signed-off-by: Stephen Hemminger
Signed-off-by: David S. Miller -
Only use__constant_htons() for initializers and switch cases.
For other uses, it is just as efficient and clearer to use htonsSigned-off-by: Stephen Hemminger
Signed-off-by: David S. Miller -
Run br_netfilter through Lindent to fix whitespace.
Signed-off-by: Stephen Hemminger
Signed-off-by: David S. Miller -
The netfilter hook that is used to receive frames doesn't need to be a
stub. It is only called in two ways, both of which ignore the return
value.Signed-off-by: Stephen Hemminger
Signed-off-by: David S. Miller -
Use kzalloc versus kmalloc+memset. Also don't need to do
memset() of bridge address since it is in netdev private data
that is already zero'd in alloc_netdev.Signed-off-by: Stephen Hemminger
Signed-off-by: David S. Miller -
Use kcalloc rather than kmalloc + memset.
Signed-off-by: Stephen Hemminger
Signed-off-by: David S. Miller -
Use the now standard setup_timer function.
Signed-off-by: Stephen Hemminger
Signed-off-by: David S. Miller -
The STP timers run off softirq (kernel timers), so there is no need to
disable bottom half in the spin locks.Signed-off-by: Stephen Hemminger
Signed-off-by: David S. Miller -
net/bridge/br_netfilter.c: In function `br_nf_pre_routing':
net/bridge/br_netfilter.c:427: warning: unused variable `vhdr'
net/bridge/br_netfilter.c:445: warning: unused variable `vhdr'Signed-off-by: Andrew Morton
Signed-off-by: David S. Miller -
net/bridge/netfilter/ebtables.c:1481: warning: initialization makes pointer from integer without a cast
Signed-off-by: Andrew Morton
Signed-off-by: David S. Miller
