diff options
| author | David S. Miller <davem@davemloft.net> | 2013-10-02 01:06:14 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-10-02 01:06:14 +0400 |
| commit | 4fbef95af4e62d4aada6c1728e04d3b1c828abe0 (patch) | |
| tree | 19cb25e39583119c98dee7114aada6a3b57d18a9 /include/net/secure_seq.h | |
| parent | 5229432f15e6f1b1e34e519e51d07917dee8790e (diff) | |
| parent | c31eeaced22ce8bd61268a3c595d542bb38c0a4f (diff) | |
| download | linux-4fbef95af4e62d4aada6c1728e04d3b1c828abe0.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/emulex/benet/be.h
drivers/net/usb/qmi_wwan.c
drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
include/net/netfilter/nf_conntrack_synproxy.h
include/net/secure_seq.h
The conflicts are of two varieties:
1) Conflicts with Joe Perches's 'extern' removal from header file
function declarations. Usually it's an argument signature change
or a function being added/removed. The resolutions are trivial.
2) Some overlapping changes in qmi_wwan.c and be.h, one commit adds
a new value, another changes an existing value. That sort of
thing.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/secure_seq.h')
| -rw-r--r-- | include/net/secure_seq.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/secure_seq.h b/include/net/secure_seq.h index 52c1a906f288..f257486f17be 100644 --- a/include/net/secure_seq.h +++ b/include/net/secure_seq.h @@ -3,7 +3,6 @@ #include <linux/types.h> -void net_secret_init(void); __u32 secure_ip_id(__be32 daddr); __u32 secure_ipv6_id(const __be32 daddr[4]); u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport); |