[SCTP] Fix warning and unused (sfr@canb.auug.org.au)

Patch submitted by Stephen Rothwell to change 'flags' to
unsigned long and remove 'unused' attribute.

diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index 5c537d9e7499b55562c11b5a88c938170796c7a2..f964badf7062982ca15a74887c1511f9498bf84e 100644 (file)
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -356,7 +356,7 @@ for (pos = (head)->next;\
 static inline void sctp_skb_list_tail(struct sk_buff_head *list,
                                      struct sk_buff_head *head)
 {
-       int flags __attribute__ ((unused));
+       unsigned long flags;
 
        sctp_spin_lock_irqsave(&head->lock, flags);
        sctp_spin_lock(&list->lock);

diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index c4e03b9f74a927d60c832872b6f6526b8ffa3633..5773728dd1febc990e6bc03e6376d0c45cc35fc7 100644 (file)
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -170,7 +170,7 @@ static void __sctp_get_local_addr_list(struct sctp_protocol *proto)
 
 static void sctp_get_local_addr_list(struct sctp_protocol *proto)
 {
-       long flags __attribute__ ((unused));
+       unsigned long flags;
 
        sctp_spin_lock_irqsave(&sctp_proto.local_addr_lock, flags);
        __sctp_get_local_addr_list(&sctp_proto);
@@ -193,7 +193,7 @@ static void __sctp_free_local_addr_list(struct sctp_protocol *proto)
 /* Free the existing local addresses.  */
 static void sctp_free_local_addr_list(struct sctp_protocol *proto)
 {
-       long flags __attribute__ ((unused));
+       unsigned long flags;
 
        sctp_spin_lock_irqsave(&proto->local_addr_lock, flags);
        __sctp_free_local_addr_list(proto);
@@ -208,7 +208,7 @@ int sctp_copy_local_addr_list(struct sctp_protocol *proto,
        struct sockaddr_storage_list *addr;
        int error = 0;
        struct list_head *pos;
-       long flags __attribute__ ((unused));
+       unsigned long flags;
 
        sctp_spin_lock_irqsave(&proto->local_addr_lock, flags);
        list_for_each(pos, &proto->local_addr_list) {
@@ -543,10 +543,10 @@ out:
 /* Event handler for inet address addition/deletion events.
  * Basically, whenever there is an event, we re-build our local address list.
  */
-static int sctp_inetaddr_event(struct notifier_block *this, unsigned long event,
+static int sctp_inetaddr_event(struct notifier_block *this, unsigned long ev,
                               void *ptr)
 {
-       long flags __attribute__ ((unused));
+       unsigned long flags;
 
        sctp_spin_lock_irqsave(&sctp_proto.local_addr_lock, flags);
        __sctp_free_local_addr_list(&sctp_proto);