projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into staging-next
[firefly-linux-kernel-4.4.55.git]
/
net
/
sctp
/
protocol.c
diff --git
a/net/sctp/protocol.c
b/net/sctp/protocol.c
index 5e17092f4adacbf0335dc33bcbde5a1f830b43df..4e1d0fcb028efa3001a0b1b69eaf80836765b49c 100644
(file)
--- a/
net/sctp/protocol.c
+++ b/
net/sctp/protocol.c
@@
-23,9
+23,8
@@
* See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with GNU CC; see the file COPYING. If not, write to
- * the Free Software Foundation, 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with GNU CC; see the file COPYING. If not, see
+ * <http://www.gnu.org/licenses/>.
*
* Please send any bug reports or fixes you make to the
* email address(es):
*
* Please send any bug reports or fixes you make to the
* email address(es):
@@
-635,10
+634,10
@@
static void sctp_addr_wq_timeout_handler(unsigned long arg)
/* ignore bound-specific endpoints */
if (!sctp_is_ep_boundall(sk))
continue;
/* ignore bound-specific endpoints */
if (!sctp_is_ep_boundall(sk))
continue;
-
sctp_
bh_lock_sock(sk);
+ bh_lock_sock(sk);
if (sctp_asconf_mgmt(sp, addrw) < 0)
pr_debug("%s: sctp_asconf_mgmt failed\n", __func__);
if (sctp_asconf_mgmt(sp, addrw) < 0)
pr_debug("%s: sctp_asconf_mgmt failed\n", __func__);
-
sctp_
bh_unlock_sock(sk);
+ bh_unlock_sock(sk);
}
#if IS_ENABLED(CONFIG_IPV6)
free_next:
}
#if IS_ENABLED(CONFIG_IPV6)
free_next:
@@
-1031,6
+1030,7
@@
static const struct net_protocol sctp_protocol = {
.err_handler = sctp_v4_err,
.no_policy = 1,
.netns_ok = 1,
.err_handler = sctp_v4_err,
.no_policy = 1,
.netns_ok = 1,
+ .icmp_strict_tag_validation = 1,
};
/* IPv4 address related functions. */
};
/* IPv4 address related functions. */
@@
-1066,8
+1066,8
@@
static struct sctp_af sctp_af_inet = {
#endif
};
#endif
};
-struct sctp_pf *sctp_get_pf_specific(sa_family_t family)
{
-
+struct sctp_pf *sctp_get_pf_specific(sa_family_t family)
+{
switch (family) {
case PF_INET:
return sctp_pf_inet_specific;
switch (family) {
case PF_INET:
return sctp_pf_inet_specific;
@@
-1461,7
+1461,6
@@
static __init int sctp_init(void)
if (status)
goto err_v6_add_protocol;
if (status)
goto err_v6_add_protocol;
- status = 0;
out:
return status;
err_v6_add_protocol:
out:
return status;
err_v6_add_protocol: