diff options
| author | David S. Miller <davem@davemloft.net> | 2014-06-04 02:32:12 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-04 02:32:12 -0400 |
| commit | c99f7abf0e69987e4add567e155e042cb1f2a20b (patch) | |
| tree | d23898dc30ed25c1dae9bb6325041027d412397a /net/ipv6 | |
| parent | 92ff71b8fe9cd9c673615fc6f3870af7376d7c84 (diff) | |
| parent | d8b0426af5b67973585712c9af36b86f6ea97815 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
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 <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/output_core.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c index 6179ac186ab9..ffa029305a09 100644 --- a/net/ipv6/output_core.c +++ b/net/ipv6/output_core.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #include <net/addrconf.h> | 8 | #include <net/addrconf.h> |
| 9 | #include <net/secure_seq.h> | 9 | #include <net/secure_seq.h> |
| 10 | 10 | ||
| 11 | |||
| 12 | int ip6_find_1stfragopt(struct sk_buff *skb, u8 **nexthdr) | 11 | int ip6_find_1stfragopt(struct sk_buff *skb, u8 **nexthdr) |
| 13 | { | 12 | { |
| 14 | u16 offset = sizeof(struct ipv6hdr); | 13 | u16 offset = sizeof(struct ipv6hdr); |