linux-stable.git/drivers/net/vxlan.c, branch v4.1

vxlan: correct typo in call to unregister_netdevice_queue

2015-05-18T20:57:09+00:00

By inspection, this appears to be a typo.  The gating comparison
involves vxlan->dev rather than dev.  In fact, dev is the iterator in
the preceding loop above but it is actually constant in the 2nd loop.

Use of dev seems to be a bad cut-n-paste from the prior call to
unregister_netdevice_queue.  Change dev to vxlan->dev, since that is
what is actually being checked.

Signed-off-by: John W. Linville 
Signed-off-by: David S. Miller

vxlan: remove the unnecessary codes

2015-04-22T22:45:49+00:00

The return value of vxlan_fdb_replace always is greater than or equal to 0

Signed-off-by: Li RongQing 
Signed-off-by: David S. Miller

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

2015-04-14T19:44:14+00:00

The dwmac-socfpga.c conflict was a case of a bug fix overlapping
changes in net-next to handle an error pointer differently.

Signed-off-by: David S. Miller

udptunnels: Call handle_offloads after inserting vlan tag.

2015-04-09T18:56:32+00:00

handle_offloads() calls skb_reset_inner_headers() to store
the layer pointers to the encapsulated packet. However, we
currently push the vlag tag (if there is one) onto the packet
afterwards. This changes the MAC header for the encapsulated
packet but it is not reflected in skb->inner_mac_header, which
breaks GSO and drivers which attempt to use this for encapsulation
offloads.

Fixes: 1eaa8178 ("vxlan: Add tx-vlan offload support.")
Signed-off-by: Jesse Gross 
Signed-off-by: David S. Miller

vxlan: do not exit on error in vxlan_stop()

2015-04-09T02:48:08+00:00

We need to clean up vxlan despite vxlan_igmp_leave() fails.

This fixes the following kernel warning:

 WARNING: CPU: 0 PID: 6 at lib/debugobjects.c:263 debug_print_object+0x7c/0x8d()
 ODEBUG: free active (active state 0) object type: timer_list hint: vxlan_cleanup+0x0/0xd0
 CPU: 0 PID: 6 Comm: kworker/u8:0 Not tainted 4.0.0-rc7+ #953
 Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011
 Workqueue: netns cleanup_net
  0000000000000009 ffff88011955f948 ffffffff81a25f5a 00000000253f253e
  ffff88011955f998 ffff88011955f988 ffffffff8107608e 0000000000000000
  ffffffff814deba2 ffff8800d4e94000 ffffffff82254c30 ffffffff81fbe455
 Call Trace:
  [] dump_stack+0x4c/0x65
  [] warn_slowpath_common+0x9c/0xb6
  [] ? debug_print_object+0x7c/0x8d
  [] warn_slowpath_fmt+0x46/0x48
  [] debug_print_object+0x7c/0x8d
  [] ? vxlan_fdb_destroy+0x5b/0x5b
  [] __debug_check_no_obj_freed+0xc3/0x15f
  [] debug_check_no_obj_freed+0x12/0x16
  [] slab_free_hook+0x64/0x6c
  [] ? kvfree+0x31/0x33
  [] kfree+0x101/0x1ac
  [] kvfree+0x31/0x33
  [] netdev_freemem+0x18/0x1a
  [] netdev_release+0x2e/0x32
  [] device_release+0x5a/0x92
  [] kobject_cleanup+0x49/0x5e
  [] kobject_put+0x45/0x49
  [] netdev_run_todo+0x26f/0x283
  [] ? rollback_registered_many+0x20f/0x23b
  [] rtnl_unlock+0xe/0x10
  [] default_device_exit_batch+0x12a/0x139
  [] ? wait_woken+0x8f/0x8f
  [] ops_exit_list+0x2b/0x57
  [] cleanup_net+0x154/0x1e7
  [] process_one_work+0x255/0x4ad
  [] ? process_one_work+0x161/0x4ad
  [] worker_thread+0x1cd/0x2ab
  [] ? process_scheduled_works+0x2f/0x2f
  [] kthread+0xd4/0xdc
  [] ? local_clock+0x19/0x22
  [] ? __kthread_parkme+0x83/0x83
  [] ret_from_fork+0x58/0x90
  [] ? __kthread_parkme+0x83/0x83

For the long-term, we should handle NETDEV_{UP,DOWN} event
from the lower device of a tunnel device.

Fixes: 56ef9c909b40 ("vxlan: Move socket initialization to within rtnl scope")
Cc: Marcelo Ricardo Leitner 
Signed-off-by: Cong Wang 
Acked-by: Marcelo Ricardo Leitner 
Signed-off-by: David S. Miller

vxlan: fix a shadow local variable

2015-04-08T18:56:35+00:00

Commit 79b16aadea32cce077
("udp_tunnel: Pass UDP socket down through udp_tunnel{, 6}_xmit_skb()")
introduce 'sk' but we already have one inner 'sk'.

Cc: David S. Miller 
Signed-off-by: Cong Wang 
Signed-off-by: David S. Miller

udp_tunnel: Pass UDP socket down through udp_tunnel{, 6}_xmit_skb().

2015-04-07T19:29:08+00:00

That was we can make sure the output path of ipv4/ipv6 operate on
the UDP socket rather than whatever random thing happens to be in
skb->sk.

Based upon a patch by Jiri Pirko.

Signed-off-by: David S. Miller 
Acked-by: Hannes Frederic Sowa

vxlan: correct spelling in comments

2015-04-02T02:52:29+00:00

Fix some spelling / typos:
* droppped -> dropped
* asddress -> address
* compatbility -> compatibility

Signed-off-by: Simon Horman 
Signed-off-by: David S. Miller

netlink: implement nla_get_in_addr and nla_get_in6_addr

2015-03-31T17:58:35+00:00

Those are counterparts to nla_put_in_addr and nla_put_in6_addr.

Signed-off-by: Jiri Benc 
Signed-off-by: David S. Miller

netlink: implement nla_put_in_addr and nla_put_in6_addr

2015-03-31T17:58:35+00:00

IP addresses are often stored in netlink attributes. Add generic functions
to do that.

For nla_put_in_addr, it would be nicer to pass struct in_addr but this is
not used universally throughout the kernel, in way too many places __be32 is
used to store IPv4 address.

Signed-off-by: Jiri Benc 
Signed-off-by: David S. Miller