Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 159312
b: refs/heads/master
c: 36cbd3d
h: refs/heads/master
v: v3
  • Loading branch information
Jan Engelhardt authored and David S. Miller committed Aug 5, 2009
1 parent 1a0ca14 commit 76f8c41
Show file tree
Hide file tree
Showing 37 changed files with 75 additions and 67 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: db71789c01ae7b641f83c5aa64e7df25122f4b28
refs/heads/master: 36cbd3dcc10384f813ec0814255f576c84f2bcd4
3 changes: 2 additions & 1 deletion trunk/include/net/ip_vs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,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 *const *names,
const 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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/net/irda/ircomm_event.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ struct ircomm_info {
struct qos_info *qos;
};

extern char *ircomm_state[];
extern const char *const ircomm_state[];

struct ircomm_cb; /* Forward decl. */

Expand Down
4 changes: 2 additions & 2 deletions trunk/include/net/irda/ircomm_tty_attach.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ struct ircomm_tty_info {
__u8 dlsap_sel;
};

extern char *ircomm_state[];
extern char *ircomm_tty_state[];
extern const char *const ircomm_state[];
extern const char *const 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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/net/irda/irlap_event.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ typedef enum { /* FIXME check the two first reason codes */
LAP_PRIMARY_CONFLICT,
} LAP_REASON;

extern const char *irlap_state[];
extern const char *const irlap_state[];

void irlap_do_event(struct irlap_cb *self, IRLAP_EVENT event,
struct sk_buff *skb, struct irlap_info *info);
Expand Down
4 changes: 2 additions & 2 deletions trunk/include/net/irda/irlmp_event.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ typedef enum {
LM_LAP_IDLE_TIMEOUT,
} IRLMP_EVENT;

extern const char *irlmp_state[];
extern const char *irlsap_state[];
extern const char *const irlmp_state[];
extern const char *const irlsap_state[];

void irlmp_watchdog_timer_expired(void *data);
void irlmp_discovery_timer_expired(void *data);
Expand Down
4 changes: 3 additions & 1 deletion trunk/include/net/sctp/constants.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,9 @@ const char *sctp_tname(const sctp_subtype_t); /* timeouts */
const char *sctp_pname(const sctp_subtype_t); /* primitives */

/* This is a table of printable names of sctp_state_t's. */
extern const char *sctp_state_tbl[], *sctp_evttype_tbl[], *sctp_status_tbl[];
extern const char *const sctp_state_tbl[];
extern const char *const sctp_evttype_tbl[];
extern const char *const sctp_status_tbl[];

/* Maximum chunk length considering padding requirements. */
enum { SCTP_MAX_CHUNK_LEN = ((1<<16) - sizeof(__u32)) };
Expand Down
2 changes: 1 addition & 1 deletion trunk/net/8021q/vlanproc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ static const struct file_operations vlandev_fops = {
*/

/* Strings */
static const char *vlan_name_type_str[VLAN_NAME_TYPE_HIGHEST] = {
static const char *const vlan_name_type_str[VLAN_NAME_TYPE_HIGHEST] = {
[VLAN_NAME_TYPE_RAW_PLUS_VID] = "VLAN_NAME_TYPE_RAW_PLUS_VID",
[VLAN_NAME_TYPE_PLUS_VID_NO_PAD] = "VLAN_NAME_TYPE_PLUS_VID_NO_PAD",
[VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD] = "VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD",
Expand Down
9 changes: 5 additions & 4 deletions trunk/net/atm/lec.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -935,9 +935,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 *const lec_arp_status_string[] = {
"ESI_UNKNOWN ",
"ESI_ARP_PENDING ",
"ESI_VC_PENDING ",
Expand Down Expand Up @@ -1121,7 +1121,8 @@ static void *lec_seq_next(struct seq_file *seq, void *v, loff_t *pos)

static int lec_seq_show(struct seq_file *seq, void *v)
{
static char lec_banner[] = "Itf MAC ATM destination"
static const char lec_banner[] =
"Itf MAC ATM destination"
" Status Flags "
"VPI/VCI Recv VPI/VCI\n";

Expand Down Expand Up @@ -1505,7 +1506,7 @@ lec_arp_remove(struct lec_priv *priv, struct lec_arp_table *to_remove)
}

#if DEBUG_ARP_TABLE
static char *get_status_string(unsigned char st)
static const char *get_status_string(unsigned char st)
{
switch (st) {
case ESI_UNKNOWN:
Expand Down
9 changes: 5 additions & 4 deletions trunk/net/atm/proc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,9 @@ static void *vcc_seq_next(struct seq_file *seq, void *v, loff_t *pos)

static void pvc_info(struct seq_file *seq, struct atm_vcc *vcc)
{
static const char *class_name[] = { "off","UBR","CBR","VBR","ABR" };
static const char *aal_name[] = {
static const char *const class_name[] =
{"off","UBR","CBR","VBR","ABR"};
static const char *const aal_name[] = {
"---", "1", "2", "3/4", /* 0- 3 */
"???", "5", "???", "???", /* 4- 7 */
"???", "???", "???", "???", /* 8-11 */
Expand All @@ -178,7 +179,7 @@ static void pvc_info(struct seq_file *seq, struct atm_vcc *vcc)

static const char *vcc_state(struct atm_vcc *vcc)
{
static const char *map[] = { ATM_VS2TXT_MAP };
static const char *const map[] = { ATM_VS2TXT_MAP };

return map[ATM_VF2VS(vcc->flags)];
}
Expand Down Expand Up @@ -335,7 +336,7 @@ static const struct file_operations vcc_seq_fops = {

static int svc_seq_show(struct seq_file *seq, void *v)
{
static char atm_svc_banner[] =
static const char atm_svc_banner[] =
"Itf VPI VCI State Remote\n";

if (v == SEQ_START_TOKEN)
Expand Down
4 changes: 2 additions & 2 deletions trunk/net/bluetooth/af_bluetooth.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ static struct net_proto_family *bt_proto[BT_MAX_PROTO];
static DEFINE_RWLOCK(bt_proto_lock);

static struct lock_class_key bt_lock_key[BT_MAX_PROTO];
static const char *bt_key_strings[BT_MAX_PROTO] = {
static const char *const bt_key_strings[BT_MAX_PROTO] = {
"sk_lock-AF_BLUETOOTH-BTPROTO_L2CAP",
"sk_lock-AF_BLUETOOTH-BTPROTO_HCI",
"sk_lock-AF_BLUETOOTH-BTPROTO_SCO",
Expand All @@ -61,7 +61,7 @@ static const char *bt_key_strings[BT_MAX_PROTO] = {
};

static struct lock_class_key bt_slock_key[BT_MAX_PROTO];
static const char *bt_slock_key_strings[BT_MAX_PROTO] = {
static const char *const bt_slock_key_strings[BT_MAX_PROTO] = {
"slock-AF_BLUETOOTH-BTPROTO_L2CAP",
"slock-AF_BLUETOOTH-BTPROTO_HCI",
"slock-AF_BLUETOOTH-BTPROTO_SCO",
Expand Down
2 changes: 1 addition & 1 deletion trunk/net/bridge/br_stp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/
#define MESSAGE_AGE_INCR ((HZ < 256) ? 1 : (HZ/256))

static const char *br_port_state_names[] = {
static const char *const br_port_state_names[] = {
[BR_STATE_DISABLED] = "disabled",
[BR_STATE_LISTENING] = "listening",
[BR_STATE_LEARNING] = "learning",
Expand Down
2 changes: 1 addition & 1 deletion trunk/net/core/dev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ static const unsigned short netdev_lock_type[] =
ARPHRD_PHONET_PIPE, ARPHRD_IEEE802154, ARPHRD_IEEE802154_PHY,
ARPHRD_VOID, ARPHRD_NONE};

static const char *netdev_lock_name[] =
static const char *const netdev_lock_name[] =
{"_xmit_NETROM", "_xmit_ETHER", "_xmit_EETHER", "_xmit_AX25",
"_xmit_PRONET", "_xmit_CHAOS", "_xmit_IEEE802", "_xmit_ARCNET",
"_xmit_APPLETLK", "_xmit_DLCI", "_xmit_ATM", "_xmit_METRICOM",
Expand Down
2 changes: 1 addition & 1 deletion trunk/net/core/net-sysfs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ static ssize_t show_dormant(struct device *dev,
return -EINVAL;
}

static const char *operstates[] = {
static const char *const operstates[] = {
"unknown",
"notpresent", /* currently unused */
"down",
Expand Down
6 changes: 3 additions & 3 deletions trunk/net/core/sock.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ static struct lock_class_key af_family_slock_keys[AF_MAX];
* strings build-time, so that runtime initialization of socket
* locks is fast):
*/
static const char *af_family_key_strings[AF_MAX+1] = {
static const char *const af_family_key_strings[AF_MAX+1] = {
"sk_lock-AF_UNSPEC", "sk_lock-AF_UNIX" , "sk_lock-AF_INET" ,
"sk_lock-AF_AX25" , "sk_lock-AF_IPX" , "sk_lock-AF_APPLETALK",
"sk_lock-AF_NETROM", "sk_lock-AF_BRIDGE" , "sk_lock-AF_ATMPVC" ,
Expand All @@ -158,7 +158,7 @@ static const char *af_family_key_strings[AF_MAX+1] = {
"sk_lock-AF_IEEE802154",
"sk_lock-AF_MAX"
};
static const char *af_family_slock_key_strings[AF_MAX+1] = {
static const char *const af_family_slock_key_strings[AF_MAX+1] = {
"slock-AF_UNSPEC", "slock-AF_UNIX" , "slock-AF_INET" ,
"slock-AF_AX25" , "slock-AF_IPX" , "slock-AF_APPLETALK",
"slock-AF_NETROM", "slock-AF_BRIDGE" , "slock-AF_ATMPVC" ,
Expand All @@ -174,7 +174,7 @@ static const char *af_family_slock_key_strings[AF_MAX+1] = {
"slock-AF_IEEE802154",
"slock-AF_MAX"
};
static const char *af_family_clock_key_strings[AF_MAX+1] = {
static const char *const af_family_clock_key_strings[AF_MAX+1] = {
"clock-AF_UNSPEC", "clock-AF_UNIX" , "clock-AF_INET" ,
"clock-AF_AX25" , "clock-AF_IPX" , "clock-AF_APPLETALK",
"clock-AF_NETROM", "clock-AF_BRIDGE" , "clock-AF_ATMPVC" ,
Expand Down
4 changes: 2 additions & 2 deletions trunk/net/dccp/ccids/ccid3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static int ccid3_debug;
#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 *const ccid3_state_names[] = {
[TFRC_SSTATE_NO_SENT] = "NO_SENT",
[TFRC_SSTATE_NO_FBACK] = "NO_FBACK",
[TFRC_SSTATE_FBACK] = "FBACK",
Expand Down Expand Up @@ -646,7 +646,7 @@ enum ccid3_fback_type {
#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 *const ccid3_rx_state_names[] = {
[TFRC_RSTATE_NO_DATA] = "NO_DATA",
[TFRC_RSTATE_DATA] = "DATA",
[TFRC_RSTATE_TERM] = "TERM",
Expand Down
7 changes: 4 additions & 3 deletions trunk/net/dccp/feat.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ static int dccp_feat_default_value(u8 feat_num)
*/
static const char *dccp_feat_fname(const u8 feat)
{
static const char *feature_names[] = {
static const char *const feature_names[] = {
[DCCPF_RESERVED] = "Reserved",
[DCCPF_CCID] = "CCID",
[DCCPF_SHORT_SEQNOS] = "Allow Short Seqnos",
Expand All @@ -236,8 +236,9 @@ static const char *dccp_feat_fname(const u8 feat)
return feature_names[feat];
}

static const char *dccp_feat_sname[] = { "DEFAULT", "INITIALISING", "CHANGING",
"UNSTABLE", "STABLE" };
static const char *const dccp_feat_sname[] = {
"DEFAULT", "INITIALISING", "CHANGING", "UNSTABLE", "STABLE",
};

#ifdef CONFIG_IP_DCCP_DEBUG
static const char *dccp_feat_oname(const u8 opt)
Expand Down
4 changes: 2 additions & 2 deletions trunk/net/dccp/proto.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ EXPORT_SYMBOL_GPL(dccp_done);

const char *dccp_packet_name(const int type)
{
static const char *dccp_packet_names[] = {
static const char *const dccp_packet_names[] = {
[DCCP_PKT_REQUEST] = "REQUEST",
[DCCP_PKT_RESPONSE] = "RESPONSE",
[DCCP_PKT_DATA] = "DATA",
Expand All @@ -147,7 +147,7 @@ EXPORT_SYMBOL_GPL(dccp_packet_name);

const char *dccp_state_name(const int state)
{
static char *dccp_state_names[] = {
static const char *const dccp_state_names[] = {
[DCCP_OPEN] = "OPEN",
[DCCP_REQUESTING] = "REQUESTING",
[DCCP_PARTOPEN] = "PARTOPEN",
Expand Down
2 changes: 1 addition & 1 deletion trunk/net/ipv4/fib_trie.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2421,7 +2421,7 @@ static inline const char *rtn_scope(char *buf, size_t len, enum rt_scope_t s)
}
}

static const char *rtn_type_names[__RTN_MAX] = {
static const char *const rtn_type_names[__RTN_MAX] = {
[RTN_UNSPEC] = "UNSPEC",
[RTN_UNICAST] = "UNICAST",
[RTN_LOCAL] = "LOCAL",
Expand Down
4 changes: 2 additions & 2 deletions trunk/net/ipv6/proc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ static struct snmp_mib snmp6_icmp6_list[] = {
};

/* RFC 4293 v6 ICMPMsgStatsTable; named items for RFC 2466 compatibility */
static char *icmp6type2name[256] = {
static const char *const icmp6type2name[256] = {
[ICMPV6_DEST_UNREACH] = "DestUnreachs",
[ICMPV6_PKT_TOOBIG] = "PktTooBigs",
[ICMPV6_TIME_EXCEED] = "TimeExcds",
Expand Down Expand Up @@ -144,7 +144,7 @@ static void snmp6_seq_show_icmpv6msg(struct seq_file *seq, void **mib)
/* print by name -- deprecated items */
for (i = 0; i < ICMP6MSG_MIB_MAX; i++) {
int icmptype;
char *p;
const char *p;

icmptype = i & 0xff;
p = icmp6type2name[icmptype];
Expand Down
4 changes: 2 additions & 2 deletions trunk/net/irda/ircomm/ircomm_event.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ 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 *const ircomm_state[] = {
"IRCOMM_IDLE",
"IRCOMM_WAITI",
"IRCOMM_WAITR",
"IRCOMM_CONN",
};

#ifdef CONFIG_IRDA_DEBUG
static char *ircomm_event[] = {
static const char *const ircomm_event[] = {
"IRCOMM_CONNECT_REQUEST",
"IRCOMM_CONNECT_RESPONSE",
"IRCOMM_TTP_CONNECT_INDICATION",
Expand Down
4 changes: 2 additions & 2 deletions trunk/net/irda/ircomm/ircomm_tty_attach.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 *const ircomm_tty_state[] = {
"IRCOMM_TTY_IDLE",
"IRCOMM_TTY_SEARCH",
"IRCOMM_TTY_QUERY_PARAMETERS",
Expand All @@ -91,7 +91,7 @@ char *ircomm_tty_state[] = {
};

#ifdef CONFIG_IRDA_DEBUG
static char *ircomm_tty_event[] = {
static const char *const ircomm_tty_event[] = {
"IRCOMM_TTY_ATTACH_CABLE",
"IRCOMM_TTY_DETACH_CABLE",
"IRCOMM_TTY_DATA_REQUEST",
Expand Down
4 changes: 2 additions & 2 deletions trunk/net/irda/iriap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

#ifdef CONFIG_IRDA_DEBUG
/* FIXME: This one should go in irlmp.c */
static const char *ias_charset_types[] = {
static const char *const ias_charset_types[] = {
"CS_ASCII",
"CS_ISO_8859_1",
"CS_ISO_8859_2",
Expand Down Expand Up @@ -966,7 +966,7 @@ static void iriap_watchdog_timer_expired(void *data)

#ifdef CONFIG_PROC_FS

static const char *ias_value_types[] = {
static const char *const ias_value_types[] = {
"IAS_MISSING",
"IAS_INTEGER",
"IAS_OCT_SEQ",
Expand Down
4 changes: 2 additions & 2 deletions trunk/net/irda/irlan/irlan_common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,14 @@ static int eth; /* Use "eth" or "irlan" name for devices */
static int access = ACCESS_PEER; /* PEER, DIRECT or HOSTED */

#ifdef CONFIG_PROC_FS
static const char *irlan_access[] = {
static const char *const irlan_access[] = {
"UNKNOWN",
"DIRECT",
"PEER",
"HOSTED"
};

static const char *irlan_media[] = {
static const char *const irlan_media[] = {
"UNKNOWN",
"802.3",
"802.5"
Expand Down
2 changes: 1 addition & 1 deletion trunk/net/irda/irlap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ static void irlap_init_qos_capabilities(struct irlap_cb *self,
struct qos_info *qos_user);

#ifdef CONFIG_IRDA_DEBUG
static char *lap_reasons[] = {
static const char *const lap_reasons[] = {
"ERROR, NOT USED",
"LAP_DISC_INDICATION",
"LAP_NO_RESPONSE",
Expand Down
4 changes: 2 additions & 2 deletions trunk/net/irda/irlap_event.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ static int irlap_state_reset_check(struct irlap_cb *, IRLAP_EVENT event,
struct sk_buff *, struct irlap_info *);

#ifdef CONFIG_IRDA_DEBUG
static const char *irlap_event[] = {
static const char *const irlap_event[] = {
"DISCOVERY_REQUEST",
"CONNECT_REQUEST",
"CONNECT_RESPONSE",
Expand Down Expand Up @@ -120,7 +120,7 @@ static const char *irlap_event[] = {
};
#endif /* CONFIG_IRDA_DEBUG */

const char *irlap_state[] = {
const char *const irlap_state[] = {
"LAP_NDM",
"LAP_QUERY",
"LAP_REPLY",
Expand Down
Loading

0 comments on commit 76f8c41

Please sign in to comment.