[NET][JANITOR] Add const string const-goodness to net/* and include/net/*

@@ -167,7 +167,7 @@ typedef void nf_logfn(unsigned int pf,
 struct nf_logger {
 	struct module	*me;
 	nf_logfn 	*logfn;
-	char		*name;
+	const char	*name;
 };
 
 /* Function to register/unregister log function. */

@@ -271,7 +271,7 @@ struct nf_queue_handler {
 	int (*outfn)(struct sk_buff *skb, struct nf_info *info,
 		     unsigned int queuenum, void *data);
 	void *data;
-	char *name;
+	const char *name;
 };
 extern int nf_register_queue_handler(int pf, 
                                      struct nf_queue_handler *qh);

@@ -186,7 +186,7 @@ struct xt_target
 {
 	struct list_head list;
 
-	const char name[XT_FUNCTION_MAXNAMELEN-1];
+	const char const name[XT_FUNCTION_MAXNAMELEN-1];
 
 	/* Returns verdict. Argument order changed since 2.6.9, as this
 	   must now handle non-linear skbs, using skb_copy_bits and

@@ -218,7 +218,7 @@ struct xt_target
 	/* Set this to THIS_MODULE if you are a module, otherwise NULL */
 	struct module *me;
 
-	char *table;
+	const char *table;
 	unsigned int targetsize;
 	unsigned int compatsize;
 	unsigned int hooks;

@@ -98,7 +98,7 @@ struct rpc_authops {
 	struct module		*owner;
 	rpc_authflavor_t	au_flavor;	/* flavor (RPC_AUTH_*) */
 #ifdef RPC_DEBUG
-	char *			au_name;
+	const char *		au_name;
 #endif
 	struct rpc_auth *	(*create)(struct rpc_clnt *, rpc_authflavor_t);
 	void			(*destroy)(struct rpc_auth *);

@@ -67,7 +67,7 @@ struct cache_detail {
 
 	atomic_t		inuse; /* active user-space update or lookup */
 
-	char			*name;
+	const char		*name;
 	void			(*cache_put)(struct kref *);
 
 	void			(*cache_request)(struct cache_detail *cd,

@@ -35,7 +35,7 @@ struct rpc_clnt {
 				cl_maxproc;	/* max procedure number */
 
 	char *			cl_server;	/* server machine name */
-	char *			cl_protname;	/* protocol name */
+	const char *		cl_protname;	/* protocol name */
 	struct rpc_auth *	cl_auth;	/* authenticator */
 	struct rpc_stat *	cl_stats;	/* per-program statistics */
 	struct rpc_iostats *	cl_metrics;	/* per-client statistics */

@@ -63,7 +63,7 @@ struct rpc_clnt {
  */
 #define RPC_MAXVERSION		4
 struct rpc_program {
-	char *			name;		/* protocol name */
+	const char *		name;		/* protocol name */
 	u32			number;		/* program number */
 	unsigned int		nrvers;		/* number of versions */
 	struct rpc_version **	version;	/* version array */

@@ -89,7 +89,7 @@ struct rpc_procinfo {
 	unsigned int		p_count;	/* call count */
 	unsigned int		p_timer;	/* Which RTT timer to use */
 	u32			p_statidx;	/* Which procedure to account */
-	char *			p_name;		/* name of procedure */
+	const char *		p_name;		/* name of procedure */
 };
 
 #ifdef __KERNEL__

@@ -100,7 +100,7 @@ struct rpc_create_args {
 	size_t			addrsize;
 	struct sockaddr		*saddress;
 	struct rpc_timeout	*timeout;
-	char			*servername;
+	const char		*servername;
 	struct rpc_program	*program;
 	u32			version;
 	rpc_authflavor_t	authflavor;

@@ -142,7 +142,7 @@ void		rpc_setbufsize(struct rpc_clnt *, unsigned int, unsigned int);
 size_t		rpc_max_payload(struct rpc_clnt *);
 void		rpc_force_rebind(struct rpc_clnt *);
 size_t		rpc_peeraddr(struct rpc_clnt *, struct sockaddr *, size_t);
-char *		rpc_peeraddr2str(struct rpc_clnt *, enum rpc_display_format_t);
+const char *	rpc_peeraddr2str(struct rpc_clnt *, enum rpc_display_format_t);
 
 #endif /* __KERNEL__ */
 #endif /* _LINUX_SUNRPC_CLNT_H */

@@ -65,7 +65,7 @@ char *gss_service_to_auth_domain_name(struct gss_api_mech *, u32 service);
 struct pf_desc {
 	u32	pseudoflavor;
 	u32	service;
-	char	*name;
+	const char *name;
 	char	*auth_domain_name;
 };
 

@@ -77,7 +77,7 @@ struct gss_api_mech {
 	struct list_head	gm_list;
 	struct module		*gm_owner;
 	struct xdr_netobj	gm_oid;
-	char			*gm_name;
+	const char		*gm_name;
 	const struct gss_api_ops *gm_ops;
 	/* pseudoflavors supported by this mechanism: */
 	int			gm_pf_num;

@@ -113,7 +113,7 @@ enum seal_alg {
 #define ENCTYPE_UNKNOWN         0x01ff
 
 s32
-make_checksum(char *, char *header, int hdrlen, struct xdr_buf *body,
+make_checksum(const char *, char *header, int hdrlen, struct xdr_buf *body,
 		   int body_offset, struct xdr_netobj *cksum);
 
 u32 gss_get_mic_kerberos(struct gss_ctx *, struct xdr_buf *,

@@ -92,7 +92,7 @@ struct auth_domain {
  *   an appropriate 'auth_domain' as the client.
  */
 struct auth_ops {
-	char *	name;
+	const char *name;
 	struct module *owner;
 	int	flavour;
 	int	(*accept)(struct svc_rqst *rq, __be32 *authp);

@@ -129,7 +129,7 @@ extern void svcauth_unix_purge(void);
 extern void svcauth_unix_info_release(void *);
 extern int svcauth_unix_set_client(struct svc_rqst *rqstp);
 
-static inline unsigned long hash_str(char *name, int bits)
+static inline unsigned long hash_str(const char *name, int bits)
 {
 	unsigned long hash = 0;
 	unsigned long l = 0;

@@ -193,7 +193,7 @@ struct rpc_xprt {
 					bklog_u;	/* backlog queue utilization */
 	} stat;
 
-	char *			address_strings[RPC_DISPLAY_MAX];
+	const char *		address_strings[RPC_DISPLAY_MAX];
 };
 
 struct rpc_xprtsock_create {

@@ -380,7 +380,7 @@ int p9_deserialize_stat(void *buf, u32 buflen, struct p9_stat *stat,
 	int dotu);
 int p9_deserialize_fcall(void *buf, u32 buflen, struct p9_fcall *fc, int dotu);
 void p9_set_tag(struct p9_fcall *fc, u16 tag);
-struct p9_fcall *p9_create_tversion(u32 msize, char *version);
+struct p9_fcall *p9_create_tversion(u32 msize, const char *version);
 struct p9_fcall *p9_create_tattach(u32 fid, u32 afid, char *uname,
 	char *aname);
 struct p9_fcall *p9_create_tauth(u32 afid, char *uname, char *aname);

@@ -115,7 +115,7 @@ extern int tcf_unregister_action(struct tc_action_ops *a);
 extern void tcf_action_destroy(struct tc_action *a, int bind);
 extern int tcf_action_exec(struct sk_buff *skb, struct tc_action *a, struct tcf_result *res);
 extern struct tc_action *tcf_action_init(struct rtattr *rta, struct rtattr *est, char *n, int ovr, int bind, int *err);
-extern struct tc_action *tcf_action_init_1(struct rtattr *rta, struct rtattr *est, char *n, int ovr, int bind, int *err);
+extern struct tc_action *tcf_action_init_1(struct rtattr *rta, struct rtattr *est, const char *n, int ovr, int bind, int *err);
 extern int tcf_action_dump(struct sk_buff *skb, struct tc_action *a, int, int);
 extern int tcf_action_dump_old(struct sk_buff *skb, struct tc_action *a, int, int);
 extern int tcf_action_dump_1(struct sk_buff *skb, struct tc_action *a, int, int);

@@ -285,7 +285,7 @@ extern struct sock *ax25_make_new(struct sock *, struct ax25_dev *);
 extern const ax25_address ax25_bcast;
 extern const ax25_address ax25_defaddr;
 extern const ax25_address null_ax25_address;
-extern char *ax2asc(char *buf, const ax25_address *);
+extern const char *ax2asc(char *buf, const ax25_address *);
 extern void asc2ax(ax25_address *addr, const char *callsign);
 extern int ax25cmp(const ax25_address *, const ax25_address *);
 extern int ax25digicmp(const ax25_digi *, const ax25_digi *);

@@ -457,7 +457,7 @@ void hci_conn_del_sysfs(struct hci_conn *conn);
 
 /* ----- HCI protocols ----- */
 struct hci_proto {
-	char 		*name;
+	const char	*name;
 	unsigned int	id;
 	unsigned long	flags;
 

@@ -547,7 +547,7 @@ int hci_unregister_proto(struct hci_proto *hproto);
 struct hci_cb {
 	struct list_head list;
 
-	char *name;
+	const char *name;
 
 	void (*auth_cfm)	(struct hci_conn *conn, __u8 status);
 	void (*encrypt_cfm)	(struct hci_conn *conn, __u8 status, __u8 encrypt);

@@ -74,7 +74,7 @@ struct dn_dev_parms {
 	unsigned long t2;         /* Default value of t2                */
 	unsigned long t3;         /* Default value of t3                */
 	int priority;             /* Priority to be a router            */
-	char *name;               /* Name for sysctl                    */
+	const char *name;         /* Name for sysctl                    */
 	int ctl_name;             /* Index for sysctl                   */
 	int  (*up)(struct net_device *);
 	void (*down)(struct net_device *);

@@ -436,7 +436,7 @@ struct sk_buff;
 
 struct ip_vs_protocol {
 	struct ip_vs_protocol	*next;
-	char			*name;
+	const char		*name;
 	__u16			protocol;
 	int			dont_defrag;
 	atomic_t		appcnt;		/* counter of proto app incs */

@@ -617,7 +617,7 @@ struct ip_vs_dest {
  */
 struct ip_vs_scheduler {
 	struct list_head	n_list;		/* d-linked list head */
-	char			*name;		/* scheduler name */
+	const char		*name;		/* scheduler name */
 	atomic_t		refcnt;		/* reference counter */
 	struct module		*module;	/* THIS_MODULE/NULL */
 

@@ -641,7 +641,7 @@ struct ip_vs_app
 {
 	struct list_head	a_list;		/* member in app list */
 	int			type;		/* IP_VS_APP_TYPE_xxx */
-	char			*name;		/* application module name */
+	const char		*name;		/* application module name */
 	__u16			protocol;
 	struct module		*module;	/* THIS_MODULE/NULL */
 	struct list_head	incs_list;	/* list of incarnations */

@@ -848,7 +848,8 @@ extern void ip_vs_protocol_cleanup(void);
 extern void ip_vs_protocol_timeout_change(int flags);
 extern int *ip_vs_create_timeout_table(int *table, int size);
 extern int
-ip_vs_set_state_timeout(int *table, int num, char **names, char *name, int to);
+ip_vs_set_state_timeout(int *table, int num, const char **names,
+			char *name, int to);
 extern void
 ip_vs_tcpudp_debug_packet(struct ip_vs_protocol *pp, const struct sk_buff *skb,
 			  int offset, const char *msg);

@@ -74,7 +74,7 @@ struct ircomm_info {
 	struct qos_info *qos;
 };
 
-extern char *ircomm_state[];
+extern const char *ircomm_state[];
 
 struct ircomm_cb;   /* Forward decl. */
 

@@ -66,8 +66,7 @@ struct ircomm_tty_info {
         __u8      dlsap_sel;
 };
 
-extern char *ircomm_state[];
-extern char *ircomm_tty_state[];
+extern const char *ircomm_tty_state[];
 
 int ircomm_tty_do_event(struct ircomm_tty_cb *self, IRCOMM_TTY_EVENT event,
 			struct sk_buff *skb, struct ircomm_tty_info *info);

@@ -96,7 +96,7 @@ void iriap_close(struct iriap_cb *self);
 
 int iriap_getvaluebyclass_request(struct iriap_cb *self, 
 				  __u32 saddr, __u32 daddr,
-				  char *name, char *attr);
+				  const char *name, const char *attr);
 void iriap_connect_request(struct iriap_cb *self);
 void iriap_send_ack( struct iriap_cb *self);
 void iriap_call_indication(struct iriap_cb *self, struct sk_buff *skb);

@@ -62,7 +62,7 @@ struct ias_value {
 	/* Value */
 	union {
 		int integer;
-		char *string;
+		const char *string;
 		__u8 *oct_seq;
 	} t;
 };

@@ -74,29 +74,30 @@ struct ias_attrib {
 	irda_queue_t q; /* Must be first! */
 	int magic;
 
-        char *name;   	         /* Attribute name */
+	const char *name;	 /* Attribute name */
 	struct ias_value *value; /* Attribute value */
 };
 
-struct ias_object *irias_new_object(char *name, int id);
+struct ias_object *irias_new_object(const char *name, int id);
 void irias_insert_object(struct ias_object *obj);
 int  irias_delete_object(struct ias_object *obj);
 int  irias_delete_attrib(struct ias_object *obj, struct ias_attrib *attrib,
 			 int cleanobject);
 void __irias_delete_object(struct ias_object *obj);
 
-void irias_add_integer_attrib(struct ias_object *obj, char *name, int value,
-			      int user);
-void irias_add_string_attrib(struct ias_object *obj, char *name, char *value,
-			     int user);
-void irias_add_octseq_attrib(struct ias_object *obj, char *name, __u8 *octets,
-			     int len, int user);
-int irias_object_change_attribute(char *obj_name, char *attrib_name, 
+void irias_add_integer_attrib(struct ias_object *obj, const char *name,
+			      int value, int user);
+void irias_add_string_attrib(struct ias_object *obj, const char *name,
+			     const char *value, int user);
+void irias_add_octseq_attrib(struct ias_object *obj, const char *name,
+			     __u8 *octets, int len, int user);
+int irias_object_change_attribute(const char *obj_name,
+				  const char *attrib_name, 
 				  struct ias_value *new_value);
-struct ias_object *irias_find_object(char *name);
-struct ias_attrib *irias_find_attrib(struct ias_object *obj, char *name);
+struct ias_object *irias_find_object(const char *name);
+struct ias_attrib *irias_find_attrib(struct ias_object *obj, const char *name);
 
-struct ias_value *irias_new_string_value(char *string);
+struct ias_value *irias_new_string_value(const char *string);
 struct ias_value *irias_new_integer_value(int integer);
 struct ias_value *irias_new_octseq_value(__u8 *octseq , int len);
 struct ias_value *irias_new_missing_value(void);

@@ -217,11 +217,14 @@ void irlan_close_data_channel(struct irlan_cb *self);
 void irlan_set_multicast_filter(struct irlan_cb *self, int status);
 void irlan_set_broadcast_filter(struct irlan_cb *self, int status);
 
-int irlan_insert_byte_param(struct sk_buff *skb, char *param, __u8 value);
-int irlan_insert_short_param(struct sk_buff *skb, char *param, __u16 value);
-int irlan_insert_string_param(struct sk_buff *skb, char *param, char *value);
-int irlan_insert_array_param(struct sk_buff *skb, char *name, __u8 *value, 
-			     __u16 value_len);
+int irlan_insert_byte_param(struct sk_buff *skb,
+			    const char *param, __u8 value);
+int irlan_insert_short_param(struct sk_buff *skb,
+			     const char *param, __u16 value);
+int irlan_insert_string_param(struct sk_buff *skb,
+			      const char *param, const char *value);
+int irlan_insert_array_param(struct sk_buff *skb, const char *name,
+			     __u8 *value, __u16 value_len);
 
 int irlan_extract_param(__u8 *buf, char *name, char *value, __u16 *len);
 

@@ -67,7 +67,7 @@ typedef enum {
 	IRLAN_WATCHDOG_TIMEOUT,
 } IRLAN_EVENT;
 
-extern char *irlan_state[];
+extern const char *irlan_state[];
 
 void irlan_do_client_event(struct irlan_cb *self, IRLAN_EVENT event, 
 			   struct sk_buff *skb);

@@ -89,7 +89,7 @@ typedef struct {
 	int              pi_major_offset;
 } pi_param_info_t;
 
-int irda_param_pack(__u8 *buf, char *fmt, ...);
+int irda_param_pack(__u8 *buf, const char *fmt, ...);
 
 int irda_param_insert(void *self, __u8 pi, __u8 *buf, int len, 
 		      pi_param_info_t *info);

@@ -437,7 +437,7 @@ struct iw_public_data {
 extern void wireless_send_event(struct net_device *	dev,
 				unsigned int		cmd,
 				union iwreq_data *	wrqu,
-				char *			extra);
+				const char *		extra);
 
 /* We may need a function to send a stream of events to user space.
  * More on that later... */

@@ -504,7 +504,7 @@ static inline char *
 iwe_stream_add_point(char *	stream,		/* Stream of events */
 		     char *	ends,		/* End of stream */
 		     struct iw_event *iwe,	/* Payload length + flags */
-		     char *	extra)		/* More payload */
+		     const char *extra)		/* More payload */
 {
 	int	event_len = IW_EV_POINT_LEN + iwe->u.data.length;
 	/* Check if it's possible */

@@ -147,7 +147,7 @@ struct neigh_table
 	int			(*pconstructor)(struct pneigh_entry *);
 	void			(*pdestructor)(struct pneigh_entry *);
 	void			(*proxy_redo)(struct sk_buff *skb);
-	char			*id;
+	const char		*id;
 	struct neigh_parms	parms;
 	/* HACK. gc_* shoul follow parms without a gap! */
 	int			gc_interval;

@@ -236,7 +236,7 @@ extern void neigh_seq_stop(struct seq_file *, void *);
 extern int			neigh_sysctl_register(struct net_device *dev, 
 						      struct neigh_parms *p,
 						      int p_id, int pdev_id,
-						      char *p_name,
+						      const char *p_name,
 						      proc_handler *proc_handler,
 						      ctl_handler *strategy);
 extern void			neigh_sysctl_unregister(struct neigh_parms *p);

@@ -1878,7 +1878,7 @@ typedef struct sctp_cmsgs {
 
 /* Structure for tracking memory objects */
 typedef struct {
-	char *label;
+	const char *label;
 	atomic_t *counter;
 } sctp_dbg_objcnt_entry_t;
 

@@ -33,7 +33,7 @@
  *  - name of entries.
  */
 struct snmp_mib {
-	char *name;
+	const char *name;
 	int entry;
 };
 

@@ -1286,7 +1286,7 @@ enum tcp_seq_states {
 
 struct tcp_seq_afinfo {
 	struct module		*owner;
-	char			*name;
+	const char		*name;
 	sa_family_t		family;
 	int			(*seq_show) (struct seq_file *m, void *v);
 	struct file_operations	*seq_fops;

@@ -101,7 +101,7 @@ struct tipc_bearer {
 
 
 int  tipc_register_media(u32 media_type,
-			 char *media_name, 
+			 const char *media_name, 
 			 int (*enable)(struct tipc_bearer *), 
 			 void (*disable)(struct tipc_bearer *), 
 			 int (*send_msg)(struct sk_buff *, 

@@ -152,7 +152,7 @@ DECLARE_SNMP_STAT(struct udp_mib, udp_statistics);
 /* /proc */
 struct udp_seq_afinfo {
 	struct module		*owner;
-	char			*name;
+	const char		*name;
 	sa_family_t		family;
 	struct hlist_head	*hashtable;
 	int 			(*seq_show) (struct seq_file *m, void *v);

@@ -273,7 +273,7 @@ extern void xfrm_state_delete_tunnel(struct xfrm_state *x);
 
 struct xfrm_type
 {
-	char			*description;
+	const char		*description;
 	struct module		*owner;
 	__u8			proto;
 	__u8			flags;

@@ -403,7 +403,7 @@ struct xfrm_migrate {
 struct xfrm_mgr
 {
 	struct list_head	list;
-	char			*id;
+	const char		*id;
 	int			(*notify)(struct xfrm_state *x, struct km_event *c);
 	int			(*acquire)(struct xfrm_state *x, struct xfrm_tmpl *, struct xfrm_policy *xp, int dir);
 	struct xfrm_policy	*(*compile_policy)(struct sock *sk, int opt, u8 *data, int len, int *dir);

@@ -884,8 +884,8 @@ struct xfrm_algo_comp_info {
 };
 
 struct xfrm_algo_desc {
-	char *name;
-	char *compat;
+	const char *name;
+	const char *compat;
 	u8 available:1;
 	union {
 		struct xfrm_algo_auth_info auth;

@@ -434,7 +434,7 @@ static inline void p9_put_int64(struct cbuf *bufp, u64 val, u64 * p)
 }
 
 static void
-p9_put_str(struct cbuf *bufp, char *data, struct p9_str *str)
+p9_put_str(struct cbuf *bufp, const char *data, struct p9_str *str)
 {
 	int len;
 	char *s;

@@ -523,7 +523,7 @@ void p9_set_tag(struct p9_fcall *fc, u16 tag)
 }
 EXPORT_SYMBOL(p9_set_tag);
 
-struct p9_fcall *p9_create_tversion(u32 msize, char *version)
+struct p9_fcall *p9_create_tversion(u32 msize, const char *version)
 {
 	int size;
 	struct p9_fcall *fc;

@@ -34,7 +34,7 @@
 #include <net/9p/9p.h>
 
 struct errormap {
-	char *name;
+	const char *name;
 	int val;
 
 	int namelen;

@@ -972,9 +972,9 @@ static int lecd_attach(struct atm_vcc *vcc, int arg)
 }
 
 #ifdef CONFIG_PROC_FS
-static char *lec_arp_get_status_string(unsigned char status)
+static const char *lec_arp_get_status_string(unsigned char status)
 {
-	static char *lec_arp_status_string[] = {
+	static const char *lec_arp_status_string[] = {
 		"ESI_UNKNOWN       ",
 		"ESI_ARP_PENDING   ",
 		"ESI_VC_PENDING    ",

@@ -456,7 +456,7 @@ void atm_proc_dev_deregister(struct atm_dev *dev)
 }
 
 static struct atm_proc_entry {
-	char *name;
+	const char *name;
 	const struct file_operations *proc_fops;
 	struct proc_dir_entry *dirent;
 } atm_proc_ents[] = {

@@ -47,7 +47,7 @@ EXPORT_SYMBOL(null_ax25_address);
 /*
  *	ax25 -> ascii conversion
  */
-char *ax2asc(char *buf, const ax25_address *a)
+const char *ax2asc(char *buf, const ax25_address *a)
 {
 	char c, *s;
 	int n;

@@ -516,7 +516,7 @@ static u16 cmtp_send_message(struct capi_ctr *ctrl, struct sk_buff *skb)
 	return CAPI_NOERROR;
 }
 
-static char *cmtp_procinfo(struct capi_ctr *ctrl)
+static const char *cmtp_procinfo(struct capi_ctr *ctrl)
 {
 	return "CAPI Message Transport Protocol";
 }

@@ -13,7 +13,7 @@
 #define BT_DBG(D...)
 #endif
 
-static inline char *typetostr(int type)
+static inline const char *typetostr(int type)
 {
 	switch (type) {
 	case HCI_VIRTUAL:

@@ -122,7 +122,7 @@ void br_stp_disable_port(struct net_bridge_port *p)
 static void br_stp_start(struct net_bridge *br)
 {
 	int r;
-	char *argv[] = { BR_STP_PROG, br->dev->name, "start", NULL };
+	const char *argv[] = { BR_STP_PROG, br->dev->name, "start", NULL };
 	char *envp[] = { NULL };
 
 	r = call_usermodehelper(BR_STP_PROG, argv, envp, UMH_WAIT_PROC);

@@ -144,7 +144,7 @@ static void br_stp_start(struct net_bridge *br)
 static void br_stp_stop(struct net_bridge *br)
 {
 	int r;
-	char *argv[] = { BR_STP_PROG, br->dev->name, "stop", NULL };
+	const char *argv[] = { BR_STP_PROG, br->dev->name, "stop", NULL };
 	char *envp[] = { NULL };
 
 	if (br->stp_enabled == BR_USER_STP) {

@@ -2458,14 +2458,14 @@ static void ptype_seq_decode(struct seq_file *seq, void *sym)
 #ifdef CONFIG_KALLSYMS
 	unsigned long offset = 0, symsize;
 	const char *symname;
-	char *modname;
+	const char *modname;
 	char namebuf[128];
 
 	symname = kallsyms_lookup((unsigned long)sym, &symsize, &offset,
 				  &modname, namebuf);
 
 	if (symname) {
-		char *delim = ":";
+		const char *delim = ":";
 
 		if (!modname)
 			modname = delim = "";

@@ -2637,7 +2637,7 @@ static struct neigh_sysctl_table {
 };
 
 int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p,
-			  int p_id, int pdev_id, char *p_name,
+			  int p_id, int pdev_id, const char *p_name,
 			  proc_handler *handler, ctl_handler *strategy)
 {
 	struct neigh_sysctl_table *t = kmemdup(&neigh_sysctl_template,

@@ -56,7 +56,7 @@ static struct dccp_rx_hist *ccid3_rx_hist;
 #ifdef CONFIG_IP_DCCP_CCID3_DEBUG
 static const char *ccid3_tx_state_name(enum ccid3_hc_tx_states state)
 {
-	static char *ccid3_state_names[] = {
+	static const char *ccid3_state_names[] = {
 	[TFRC_SSTATE_NO_SENT]  = "NO_SENT",
 	[TFRC_SSTATE_NO_FBACK] = "NO_FBACK",
 	[TFRC_SSTATE_FBACK]    = "FBACK",

@@ -692,7 +692,7 @@ static int ccid3_hc_tx_getsockopt(struct sock *sk, const int optname, int len,
 #ifdef CONFIG_IP_DCCP_CCID3_DEBUG
 static const char *ccid3_rx_state_name(enum ccid3_hc_rx_states state)
 {
-	static char *ccid3_rx_state_names[] = {
+	static const char *ccid3_rx_state_names[] = {
 	[TFRC_RSTATE_NO_DATA] = "NO_DATA",
 	[TFRC_RSTATE_DATA]    = "DATA",
 	[TFRC_RSTATE_TERM]    = "TERM",

@@ -132,7 +132,7 @@ EXPORT_SYMBOL_GPL(dccp_packet_name);
 
 const char *dccp_state_name(const int state)
 {
-	static char *dccp_state_names[] = {
+	static const char *dccp_state_names[] = {
 	[DCCP_OPEN]	  = "OPEN",
 	[DCCP_REQUESTING] = "REQUESTING",
 	[DCCP_PARTOPEN]	  = "PARTOPEN",

@@ -2220,7 +2220,7 @@ static void dn_printable_object(struct sockaddr_dn *dn, unsigned char *buf)
 	}
 }
 
-static char *dn_state2asc(unsigned char state)
+static const char *dn_state2asc(unsigned char state)
 {
 	switch(state) {
 		case DN_O:

@@ -1377,7 +1377,7 @@ static void dn_dev_seq_stop(struct seq_file *seq, void *v)
 	read_unlock(&dev_base_lock);
 }
 
-static char *dn_type2asc(char type)
+static const char *dn_type2asc(char type)
 {
 	switch(type) {
 		case DN_DEV_BCAST:

@@ -81,7 +81,7 @@ extern int decnet_log_martians;
 static void dn_log_martian(struct sk_buff *skb, const char *msg)
 {
 	if (decnet_log_martians && net_ratelimit()) {
-		char *devname = skb->dev ? skb->dev->name : "???";
+		const char *devname = skb->dev ? skb->dev->name : "???";
 		struct dn_skb_cb *cb = DN_SKB_CB(skb);
 		printk(KERN_INFO "DECnet: Martian packet (%s) dev=%s src=0x%04hx dst=0x%04hx srcport=0x%04hx dstport=0x%04hx\n", msg, devname, dn_ntohs(cb->src), dn_ntohs(cb->dst), dn_ntohs(cb->src_port), dn_ntohs(cb->dst_port));
 	}

@@ -474,7 +474,7 @@ static int dn_route_rx_packet(struct sk_buff *skb)
 		return dst_input(skb);
 
 	if (decnet_debug_level & 4) {
-		char *devname = skb->dev ? skb->dev->name : "???";
+		const char *devname = skb->dev ? skb->dev->name : "???";
 		struct dn_skb_cb *cb = DN_SKB_CB(skb);
 		printk(KERN_DEBUG
 			"DECnet: dn_route_rx_packet: rt_flags=0x%02x dev=%s len=%d src=0x%04hx dst=0x%04hx err=%d type=%d\n",

@@ -59,7 +59,7 @@
  * whenever the event context matches.
  */
 
-static char *event_descriptions[IEEE80211SOFTMAC_EVENT_LAST+1] = {
+static const char *event_descriptions[IEEE80211SOFTMAC_EVENT_LAST+1] = {
 	NULL, /* scan finished */
 	NULL, /* associated */
 	"associating failed",

@@ -137,7 +137,7 @@ ieee80211softmac_call_events_locked(struct ieee80211softmac_device *mac, int eve
 	if (event >= 0) {
 		union iwreq_data wrqu;
 		int we_event;
-		char *msg = NULL;
+		const char *msg = NULL;
 
 		memset(&wrqu, '\0', sizeof (union iwreq_data));
 

@@ -1258,7 +1258,7 @@ void __init arp_init(void)
 /*
  *	ax25 -> ASCII conversion
  */
-static char *ax2asc2(ax25_address *a, char *buf)
+static const char *ax2asc2(ax25_address *a, char *buf)
 {
 	char c, *s;
 	int n;

@@ -1496,7 +1496,7 @@ static void devinet_sysctl_register(struct in_device *in_dev,
 	struct net_device *dev = in_dev ? in_dev->dev : NULL;
 	struct devinet_sysctl_table *t = kmemdup(&devinet_sysctl, sizeof(*t),
 						 GFP_KERNEL);
-	char *dev_name = NULL;
+	const char *dev_name = NULL;
 
 	if (!t)
 		return;

@@ -2377,7 +2377,7 @@ static int igmp_mc_seq_show(struct seq_file *seq, void *v)
 	else {
 		struct ip_mc_list *im = (struct ip_mc_list *)v;
 		struct igmp_mc_iter_state *state = igmp_mc_seq_private(seq);
-		char   *querier;
+		const char *querier;
 #ifdef CONFIG_IP_MULTICAST
 		querier = IGMP_V1_SEEN(state->in_dev) ? "V1" :
 			  IGMP_V2_SEEN(state->in_dev) ? "V2" :

@@ -126,7 +126,7 @@ ip_vs_create_timeout_table(int *table, int size)
  *	Set timeout value for state specified by name
  */
 int
-ip_vs_set_state_timeout(int *table, int num, char **names, char *name, int to)
+ip_vs_set_state_timeout(int *table, int num, const char **names, char *name, int to)
 {
 	int i;
 

@@ -274,7 +274,7 @@ static int tcp_timeouts[IP_VS_TCP_S_LAST+1] = {
 	[IP_VS_TCP_S_LAST]		=	2*HZ,
 };
 
-static char * tcp_state_name_table[IP_VS_TCP_S_LAST+1] = {
+static const char * tcp_state_name_table[IP_VS_TCP_S_LAST+1] = {
 	[IP_VS_TCP_S_NONE]		=	"NONE",
 	[IP_VS_TCP_S_ESTABLISHED]	=	"ESTABLISHED",
 	[IP_VS_TCP_S_SYN_SENT]		=	"SYN_SENT",

@@ -369,7 +369,7 @@ static int udp_timeouts[IP_VS_UDP_S_LAST+1] = {
 	[IP_VS_UDP_S_LAST]		=	2*HZ,
 };
 
-static char * udp_state_name_table[IP_VS_UDP_S_LAST+1] = {
+static const char * udp_state_name_table[IP_VS_UDP_S_LAST+1] = {
 	[IP_VS_UDP_S_NORMAL]		=	"UDP",
 	[IP_VS_UDP_S_LAST]		=	"BUG!",
 };

@@ -1079,7 +1079,7 @@ static int snmp_parse_mangle(unsigned char *msg,
 	if (cls != ASN1_CTX || con != ASN1_CON)
 		return 0;
 	if (debug > 1) {
-		unsigned char *pdus[] = {
+		const unsigned char *pdus[] = {
 			[SNMP_PDU_GET] = "get",
 			[SNMP_PDU_NEXT] = "get-next",
 			[SNMP_PDU_RESPONSE] = "response",

@@ -4095,7 +4095,7 @@ static void addrconf_sysctl_register(struct inet6_dev *idev, struct ipv6_devconf
 	int i;
 	struct net_device *dev = idev ? idev->dev : NULL;
 	struct addrconf_sysctl_table *t;
-	char *dev_name = NULL;
+	const char *dev_name = NULL;
 
 	t = kmemdup(&addrconf_sysctl, sizeof(*t), GFP_KERNEL);
 	if (t == NULL)

@@ -1277,7 +1277,7 @@ __be16 ipx_cksum(struct ipxhdr *packet, int length)
 
 const char *ipx_frame_name(__be16 frame)
 {
-	char* rc = "None";
+	const char* rc = "None";
 
 	switch (ntohs(frame)) {
 	case ETH_P_IPX:		rc = "EtherII";	break;

@@ -538,7 +538,7 @@ static int irda_open_lsap(struct irda_sock *self, int pid)
  * Note that in some case, the query fail even before we go to sleep,
  * creating some races...
  */
-static int irda_find_lsap_sel(struct irda_sock *self, char *name)
+static int irda_find_lsap_sel(struct irda_sock *self, const char *name)
 {
 	IRDA_DEBUG(2, "%s(%p, %s)\n", __FUNCTION__, self, name);
 

@@ -49,7 +49,7 @@ static int ircomm_state_waitr(struct ircomm_cb *self, IRCOMM_EVENT event,
 static int ircomm_state_conn(struct ircomm_cb *self, IRCOMM_EVENT event,
 			     struct sk_buff *skb, struct ircomm_info *info);
 
-char *ircomm_state[] = {
+const char *ircomm_state[] = {
 	"IRCOMM_IDLE",
 	"IRCOMM_WAITI",
 	"IRCOMM_WAITR",

@@ -57,7 +57,7 @@ char *ircomm_state[] = {
 };
 
 #ifdef CONFIG_IRDA_DEBUG
-static char *ircomm_event[] = {
+static const char *ircomm_event[] = {
 	"IRCOMM_CONNECT_REQUEST",
 	"IRCOMM_CONNECT_RESPONSE",
 	"IRCOMM_TTP_CONNECT_INDICATION",

@@ -80,7 +80,7 @@ static int ircomm_tty_state_ready(struct ircomm_tty_cb *self,
 				  struct sk_buff *skb,
 				  struct ircomm_tty_info *info);
 
-char *ircomm_tty_state[] = {
+const char *ircomm_tty_state[] = {
 	"IRCOMM_TTY_IDLE",
 	"IRCOMM_TTY_SEARCH",
 	"IRCOMM_TTY_QUERY_PARAMETERS",

@@ -91,7 +91,7 @@ char *ircomm_tty_state[] = {
 };
 
 #ifdef CONFIG_IRDA_DEBUG
-static char *ircomm_tty_event[] = {
+static const char *ircomm_tty_event[] = {
 	"IRCOMM_TTY_ATTACH_CABLE",
 	"IRCOMM_TTY_DETACH_CABLE",
 	"IRCOMM_TTY_DATA_REQUEST",

@@ -369,7 +369,7 @@ static void iriap_disconnect_request(struct iriap_cb *self)
  */
 int iriap_getvaluebyclass_request(struct iriap_cb *self,
 				  __u32 saddr, __u32 daddr,
-				  char *name, char *attr)
+				  const char *name, const char *attr)
 {
 	struct sk_buff *tx_skb;
 	int name_len, attr_len, skb_len;

@@ -43,7 +43,7 @@ struct ias_value irias_missing = { IAS_MISSING, 0, 0, 0, {0}};
  *    Create a new IAS object
  *
  */
-struct ias_object *irias_new_object( char *name, int id)
+struct ias_object *irias_new_object(const char *name, int id)
 {
 	struct ias_object *obj;
 

@@ -200,7 +200,7 @@ EXPORT_SYMBOL(irias_insert_object);
  *    Find object with given name
  *
  */
-struct ias_object *irias_find_object(char *name)
+struct ias_object *irias_find_object(const char *name)
 {
 	IRDA_ASSERT(name != NULL, return NULL;);