ath10k: Remove qca98xx hw1.0 support

[cascardo/linux.git] / net / sctp / input.c

diff --git a/net/sctp/input.c b/net/sctp/input.c
index 4b2c831..3fa4d85 100644 (file)
--- a/net/sctp/input.c
+++ b/net/sctp/input.c
@@ -454,8 +454,6 @@ void sctp_icmp_proto_unreachable(struct sock *sk,
                           struct sctp_association *asoc,
                           struct sctp_transport *t)
 {
-       SCTP_DEBUG_PRINTK("%s\n",  __func__);
-
        if (sock_owned_by_user(sk)) {
                if (timer_pending(&t->proto_unreach_timer))
                        return;
@@ -464,10 +462,12 @@ void sctp_icmp_proto_unreachable(struct sock *sk,
                                                jiffies + (HZ/20)))
                                sctp_association_hold(asoc);
                }
-                       
        } else {
                struct net *net = sock_net(sk);
 
+               pr_debug("%s: unrecognized next header type "
+                        "encountered!\n", __func__);
+
                if (del_timer(&t->proto_unreach_timer))
                        sctp_association_put(asoc);
 
@@ -589,7 +589,7 @@ void sctp_v4_err(struct sk_buff *skb, __u32 info)
        struct sctp_association *asoc = NULL;
        struct sctp_transport *transport;
        struct inet_sock *inet;
-       sk_buff_data_t saveip, savesctp;
+       __u16 saveip, savesctp;
        int err;
        struct net *net = dev_net(skb->dev);
 
@@ -903,11 +903,11 @@ hit:
 }
 
 /* Look up an association. BH-safe. */
-SCTP_STATIC
+static
 struct sctp_association *sctp_lookup_association(struct net *net,
                                                 const union sctp_addr *laddr,
                                                 const union sctp_addr *paddr,
-                                           struct sctp_transport **transportp)
+                                                struct sctp_transport **transportp)
 {
        struct sctp_association *asoc;