linux-stable.git/net/hsr, branch v3.16.2

hsr: replace del_timer by del_timer_sync

2014-03-27T19:28:06+00:00

Use del_timer_sync to ensure that the timer is stopped on all CPUs before
the driver exists.

This change was suggested by Thomas Gleixner.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// 
@r@
declarer name module_exit;
identifier ex;
@@

module_exit(ex);

@@
identifier r.ex;
@@

ex(...) {
  <...
- del_timer
+ del_timer_sync
    (...)
  ...>
}
// 

Signed-off-by: Julia Lawall 
Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-03-06T01:32:02+00:00

Conflicts:
	drivers/net/wireless/ath/ath9k/recv.c
	drivers/net/wireless/mwifiex/pcie.c
	net/ipv6/sit.c

The SIT driver conflict consists of a bug fix being done by hand
in 'net' (missing u64_stats_init()) whilst in 'net-next' a helper
was created (netdev_alloc_pcpu_stats()) which takes care of this.

The two wireless conflicts were overlapping changes.

Signed-off-by: David S. Miller

hsr: off by one sanity check in hsr_register_frame_in()

2014-03-03T20:29:42+00:00

This is a sanity check and we never pass invalid values so this patch
doesn't change anything.  However the node->time_in[] array has
HSR_MAX_SLAVE (2) elements and not HSR_MAX_DEV (3).

Signed-off-by: Dan Carpenter 
Signed-off-by: David S. Miller

hsr: Use ether_addr_copy

2014-02-18T23:14:09+00:00

It's slightly smaller/faster for some architectures.
Make sure def_multicast_addr is __aligned(2)

Signed-off-by: Joe Perches 
Signed-off-by: David S. Miller

net/hsr: using kfree_rcu() to simplify the code

2013-12-17T21:32:30+00:00

The callback function of call_rcu() just calls a kfree(), so we
can use kfree_rcu() instead of call_rcu() + callback function.

Signed-off-by: Wei Yongjun 
Acked-by: Arvid Brodin 
Signed-off-by: David S. Miller

net/hsr: Support iproute print_opt ('ip -details ...')

2013-11-30T17:48:14+00:00

This implements the rtnl_link_ops fill_info routine for HSR.

Signed-off-by: Arvid Brodin 
Signed-off-by: David S. Miller

net/hsr: Very small fix of comment style.

2013-11-30T17:48:13+00:00

Signed-off-by: Arvid Brodin 
Signed-off-by: David S. Miller

genetlink: make multicast groups const, prevent abuse

2013-11-19T21:39:06+00:00

Register generic netlink multicast groups as an array with
the family and give them contiguous group IDs. Then instead
of passing the global group ID to the various functions that
send messages, pass the ID relative to the family - for most
families that's just 0 because the only have one group.

This avoids the list_head and ID in each group, adding a new
field for the mcast group ID offset to the family.

At the same time, this allows us to prevent abusing groups
again like the quota and dropmon code did, since we can now
check that a family only uses a group it owns.

Signed-off-by: Johannes Berg 
Signed-off-by: David S. Miller

genetlink: pass family to functions using groups

2013-11-19T21:39:06+00:00

This doesn't really change anything, but prepares for the
next patch that will change the APIs to pass the group ID
within the family, rather than the global group ID.

Signed-off-by: Johannes Berg 
Signed-off-by: David S. Miller

hsr: don't call genl_unregister_mc_group()

2013-11-19T21:39:06+00:00

There's no need to unregister the multicast group if the
generic netlink family is registered immediately after.

Signed-off-by: Johannes Berg 
Signed-off-by: David S. Miller