diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-11-16 14:19:34 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-11-16 14:19:34 +0100 |
| commit | 7ce7f35b33eb42b6aa4cf176fa34372b21b8472b (patch) | |
| tree | 12f3027003f1d7cce30f838265e4fab2d52c6cef /net/ipv4/raw.c | |
| parent | f410770293a1fbc08906474c24104a7a11943eb6 (diff) | |
| parent | 47bdf3378d62a627cfb8a54e1180c08d67078b61 (diff) | |
| download | linux-7ce7f35b33eb42b6aa4cf176fa34372b21b8472b.tar.gz linux-7ce7f35b33eb42b6aa4cf176fa34372b21b8472b.tar.bz2 linux-7ce7f35b33eb42b6aa4cf176fa34372b21b8472b.zip | |
Merge branch 'x86/cpufeature' into x86/cache
Resolve the cpu/scattered conflict.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'net/ipv4/raw.c')
| -rw-r--r-- | net/ipv4/raw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index 90a85c955872..ecbe5a7c2d6d 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c @@ -918,7 +918,7 @@ struct proto raw_prot = { .close = raw_close, .destroy = raw_destroy, .connect = ip4_datagram_connect, - .disconnect = udp_disconnect, + .disconnect = __udp_disconnect, .ioctl = raw_ioctl, .init = raw_init, .setsockopt = raw_setsockopt, |