irXXX_irlan_print_ret.diff :
~~~~~~~~~~~~~~~~~~~~~~~~~~
<Patch from Stephen Hemminger>
o [FEATURE] Move print_ret_code from a global to local to avoid
namespace pollution.
diff -Nru a/include/net/irda/irlan_common.h b/include/net/irda/irlan_common.h
--- a/include/net/irda/irlan_common.h Fri Mar 19 11:29:08 2004
+++ b/include/net/irda/irlan_common.h Fri Mar 19 11:29:08 2004
@@ -219,7 +219,6 @@
__u16 value_len);
int irlan_extract_param(__u8 *buf, char *name, char *value, __u16 *len);
-void print_ret_code(__u8 code);
#endif
diff -Nru a/net/irda/irlan/irlan_client.c b/net/irda/irlan/irlan_client.c
--- a/net/irda/irlan/irlan_client.c Fri Mar 19 11:29:08 2004
+++ b/net/irda/irlan/irlan_client.c Fri Mar 19 11:29:08 2004
@@ -343,6 +343,52 @@
irttp_data_request(self->client.tsap_ctrl, skb);
}
+
+/*
+ * Function print_ret_code (code)
+ *
+ * Print return code of request to peer IrLAN layer.
+ *
+ */
+static void print_ret_code(__u8 code)
+{
+ switch(code) {
+ case 0:
+ printk(KERN_INFO "Success\n");
+ break;
+ case 1:
+ WARNING("IrLAN: Insufficient resources\n");
+ break;
+ case 2:
+ WARNING("IrLAN: Invalid command format\n");
+ break;
+ case 3:
+ WARNING("IrLAN: Command not supported\n");
+ break;
+ case 4:
+ WARNING("IrLAN: Parameter not supported\n");
+ break;
+ case 5:
+ WARNING("IrLAN: Value not supported\n");
+ break;
+ case 6:
+ WARNING("IrLAN: Not open\n");
+ break;
+ case 7:
+ WARNING("IrLAN: Authentication required\n");
+ break;
+ case 8:
+ WARNING("IrLAN: Invalid password\n");
+ break;
+ case 9:
+ WARNING("IrLAN: Protocol error\n");
+ break;
+ case 255:
+ WARNING("IrLAN: Asynchronous status\n");
+ break;
+ }
+}
+
/*
* Function irlan_client_parse_response (self, skb)
*
diff -Nru a/net/irda/irlan/irlan_common.c b/net/irda/irlan/irlan_common.c
--- a/net/irda/irlan/irlan_common.c Fri Mar 19 11:29:08 2004
+++ b/net/irda/irlan/irlan_common.c Fri Mar 19 11:29:08 2004
@@ -1168,51 +1168,6 @@
}
#endif
-/*
- * Function print_ret_code (code)
- *
- * Print return code of request to peer IrLAN layer.
- *
- */
-void print_ret_code(__u8 code)
-{
- switch(code) {
- case 0:
- printk(KERN_INFO "Success\n");
- break;
- case 1:
- WARNING("IrLAN: Insufficient resources\n");
- break;
- case 2:
- WARNING("IrLAN: Invalid command format\n");
- break;
- case 3:
- WARNING("IrLAN: Command not supported\n");
- break;
- case 4:
- WARNING("IrLAN: Parameter not supported\n");
- break;
- case 5:
- WARNING("IrLAN: Value not supported\n");
- break;
- case 6:
- WARNING("IrLAN: Not open\n");
- break;
- case 7:
- WARNING("IrLAN: Authentication required\n");
- break;
- case 8:
- WARNING("IrLAN: Invalid password\n");
- break;
- case 9:
- WARNING("IrLAN: Protocol error\n");
- break;
- case 255:
- WARNING("IrLAN: Asynchronous status\n");
- break;
- }
-}
-
MODULE_AUTHOR("Dag Brattli <[email protected]>");
MODULE_DESCRIPTION("The Linux IrDA LAN protocol");
MODULE_LICENSE("GPL");