linux.git/net/ipv4/ipmr.c, branch v2.6.33

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-11-17T08:05:02+00:00

Conflicts:
	drivers/net/can/Kconfig

ipmr: missing dev_put() on error path in vif_add()

2009-11-14T03:56:54+00:00

The other error paths in front of this one have a dev_put() but this one
got missed.

Found by smatch static checker.

Signed-off-by: Dan Carpenter 
Acked-by: Wang Chen 
Signed-off-by: David S. Miller

ipmr: Optimize multiple unregistration

2009-10-29T08:13:49+00:00

Speedup module unloading by factorizing synchronize_rcu() calls

Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller

inet: rename some inet_sock fields

2009-10-19T01:52:53+00:00

In order to have better cache layouts of struct sock (separate zones
for rx/tx paths), we need this preliminary patch.

Goal is to transfert fields used at lookup time in the first
read-mostly cache line (inside struct sock_common) and move sk_refcnt
to a separate cache line (only written by rx path)

This patch adds inet_ prefix to daddr, rcv_saddr, dport, num, saddr,
sport and id fields. This allows a future patch to define these
fields as macros, like sk_refcnt, without name clashes.

Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller

add vif using local interface index instead of IP

2009-10-07T07:48:41+00:00

When routing daemon wants to enable forwarding of multicast traffic it
performs something like:

       struct vifctl vc = {
               .vifc_vifi  = 1,
               .vifc_flags = 0,
               .vifc_threshold = 1,
               .vifc_rate_limit = 0,
               .vifc_lcl_addr = ip, /* <--- ip address of physical
interface, e.g. eth0 */
               .vifc_rmt_addr.s_addr = htonl(INADDR_ANY),
         };
       setsockopt(fd, IPPROTO_IP, MRT_ADD_VIF, &vc, sizeof(vc));

This leads (in the kernel) to calling  vif_add() function call which
search the (physical) device using assigned IP address:
       dev = ip_dev_find(net, vifc->vifc_lcl_addr.s_addr);

The current API (struct vifctl) does not allow to specify an
interface other way than using it's IP, and if there are more than a
single interface with specified IP only the first one will be found.

The attached patch (against 2.6.30.4) allows to specify an interface
by its index, instead of IP address:

       struct vifctl vc = {
               .vifc_vifi  = 1,
               .vifc_flags = VIFF_USE_IFINDEX,   /* NEW */
               .vifc_threshold = 1,
               .vifc_rate_limit = 0,
               .vifc_lcl_ifindex = if_nametoindex("eth0"),   /* NEW */
               .vifc_rmt_addr.s_addr = htonl(INADDR_ANY),
         };
       setsockopt(fd, IPPROTO_IP, MRT_ADD_VIF, &vc, sizeof(vc));

Signed-off-by: Ilia K. 

=== modified file 'include/linux/mroute.h'
Signed-off-by: David S. Miller

net: Make setsockopt() optlen be unsigned.

2009-09-30T23:12:20+00:00

This provides safety against negative optlen at the type
level instead of depending upon (sometimes non-trivial)
checks against this sprinkled all over the the place, in
each and every implementation.

Based upon work done by Arjan van de Ven and feedback
from Linus Torvalds.

Signed-off-by: David S. Miller

net: constify struct net_protocol

2009-09-15T00:03:01+00:00

Remove long removed "inet_protocol_base" declaration.

Signed-off-by: Alexey Dobriyan 
Signed-off-by: David S. Miller

netdev: convert pseudo-devices to netdev_tx_t

2009-09-01T08:13:07+00:00

Signed-off-by: Stephen Hemminger 
Signed-off-by: David S. Miller

net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions

2009-07-06T02:16:04+00:00

This patch is the result of an automatic spatch transformation to convert
all ndo_start_xmit() return values of 0 to NETDEV_TX_OK.

Some occurences are missed by the automatic conversion, those will be
handled in a seperate patch.

Signed-off-by: Patrick McHardy 
Signed-off-by: David S. Miller

PIM-SM: namespace changes

2009-06-14T10:16:13+00:00

IPv4:
  - make PIM register vifs netns local
  - set the netns when a PIM register vif is created
  - make PIM available in all network namespaces (if CONFIG_IP_PIMSM_V2)
    by adding the protocol handler when multicast routing is initialized

IPv6:
  - make PIM register vifs netns local
  - make PIM available in all network namespaces (if CONFIG_IPV6_PIMSM_V2)
    by adding the protocol handler when multicast routing is initialized

Signed-off-by: Tom Goff 
Signed-off-by: David S. Miller