A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 02:32:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Conflicts:
	include/net/inetpeer.h
	net/ipv6/output_core.c

Changes in net were fixing bugs in code removed in net-next.

Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
David S. Miller 2014-06-03 23:32:12 -07:00
commit c99f7abf0e
181 changed files with 1656 additions and 925 deletions
Download patch file Download diff file Expand all files Collapse all files

1
net/ipv6/output_core.c
View file

@ -8,7 +8,6 @@
#include <net/addrconf.h>
#include <net/secure_seq.h>
int ip6_find_1stfragopt(struct sk_buff *skb, u8 **nexthdr)
{
u16 offset = sizeof(struct ipv6hdr);