Commit 6955f61d authored by Art Haas's avatar Art Haas Committed by David S. Miller

[IPV4/IPV6]: C99 designated initializers.

parent 3c2490e2
...@@ -984,16 +984,16 @@ static void rtmsg_ifa(int event, struct in_ifaddr* ifa) ...@@ -984,16 +984,16 @@ static void rtmsg_ifa(int event, struct in_ifaddr* ifa)
} }
static struct rtnetlink_link inet_rtnetlink_table[RTM_MAX - RTM_BASE + 1] = { static struct rtnetlink_link inet_rtnetlink_table[RTM_MAX - RTM_BASE + 1] = {
[4] = { doit: inet_rtm_newaddr, }, [4] = { .doit = inet_rtm_newaddr, },
[5] = { doit: inet_rtm_deladdr, }, [5] = { .doit = inet_rtm_deladdr, },
[6] = { dumpit: inet_dump_ifaddr, }, [6] = { .dumpit = inet_dump_ifaddr, },
[8] = { doit: inet_rtm_newroute, }, [8] = { .doit = inet_rtm_newroute, },
[9] = { doit: inet_rtm_delroute, }, [9] = { .doit = inet_rtm_delroute, },
[10] = { doit: inet_rtm_getroute, dumpit: inet_dump_fib, }, [10] = { .doit = inet_rtm_getroute, .dumpit = inet_dump_fib, },
#ifdef CONFIG_IP_MULTIPLE_TABLES #ifdef CONFIG_IP_MULTIPLE_TABLES
[16] = { doit: inet_rtm_newrule, }, [16] = { .doit = inet_rtm_newrule, },
[17] = { doit: inet_rtm_delrule, }, [17] = { .doit = inet_rtm_delrule, },
[18] = { dumpit: inet_dump_rules, }, [18] = { .dumpit = inet_dump_rules, },
#endif #endif
}; };
......
...@@ -126,7 +126,7 @@ static struct net_device ipgre_fb_tunnel_dev = { ...@@ -126,7 +126,7 @@ static struct net_device ipgre_fb_tunnel_dev = {
static struct ip_tunnel ipgre_fb_tunnel = { static struct ip_tunnel ipgre_fb_tunnel = {
.dev = &ipgre_fb_tunnel_dev, .dev = &ipgre_fb_tunnel_dev,
.parms ={ name: "gre0" } .parms ={ .name = "gre0" }
}; };
/* Tunnel hash table */ /* Tunnel hash table */
......
...@@ -129,7 +129,7 @@ static struct net_device ipip_fb_tunnel_dev = { ...@@ -129,7 +129,7 @@ static struct net_device ipip_fb_tunnel_dev = {
static struct ip_tunnel ipip_fb_tunnel = { static struct ip_tunnel ipip_fb_tunnel = {
.dev = &ipip_fb_tunnel_dev, .dev = &ipip_fb_tunnel_dev,
.parms ={ name: "tunl0", } .parms ={ .name = "tunl0", }
}; };
static struct ip_tunnel *tunnels_r_l[HASH_SIZE]; static struct ip_tunnel *tunnels_r_l[HASH_SIZE];
......
...@@ -81,8 +81,8 @@ void tcp_v4_send_check(struct sock *sk, struct tcphdr *th, int len, ...@@ -81,8 +81,8 @@ void tcp_v4_send_check(struct sock *sk, struct tcphdr *th, int len,
struct tcp_hashinfo __cacheline_aligned tcp_hashinfo = { struct tcp_hashinfo __cacheline_aligned tcp_hashinfo = {
.__tcp_lhash_lock = RW_LOCK_UNLOCKED, .__tcp_lhash_lock = RW_LOCK_UNLOCKED,
.__tcp_lhash_users = ATOMIC_INIT(0), .__tcp_lhash_users = ATOMIC_INIT(0),
__tcp_lhash_wait: .__tcp_lhash_wait
__WAIT_QUEUE_HEAD_INITIALIZER(tcp_hashinfo.__tcp_lhash_wait), = __WAIT_QUEUE_HEAD_INITIALIZER(tcp_hashinfo.__tcp_lhash_wait),
.__tcp_portalloc_lock = SPIN_LOCK_UNLOCKED .__tcp_portalloc_lock = SPIN_LOCK_UNLOCKED
}; };
......
...@@ -428,7 +428,7 @@ static void tcp_twkill(unsigned long); ...@@ -428,7 +428,7 @@ static void tcp_twkill(unsigned long);
static struct tcp_tw_bucket *tcp_tw_death_row[TCP_TWKILL_SLOTS]; static struct tcp_tw_bucket *tcp_tw_death_row[TCP_TWKILL_SLOTS];
static spinlock_t tw_death_lock = SPIN_LOCK_UNLOCKED; static spinlock_t tw_death_lock = SPIN_LOCK_UNLOCKED;
static struct timer_list tcp_tw_timer = { function: tcp_twkill }; static struct timer_list tcp_tw_timer = { .function = tcp_twkill };
static void SMP_TIMER_NAME(tcp_twkill)(unsigned long dummy) static void SMP_TIMER_NAME(tcp_twkill)(unsigned long dummy)
{ {
...@@ -495,7 +495,7 @@ void tcp_tw_deschedule(struct tcp_tw_bucket *tw) ...@@ -495,7 +495,7 @@ void tcp_tw_deschedule(struct tcp_tw_bucket *tw)
static int tcp_twcal_hand = -1; static int tcp_twcal_hand = -1;
static int tcp_twcal_jiffie; static int tcp_twcal_jiffie;
static void tcp_twcal_tick(unsigned long); static void tcp_twcal_tick(unsigned long);
static struct timer_list tcp_twcal_timer = {function: tcp_twcal_tick}; static struct timer_list tcp_twcal_timer = {.function = tcp_twcal_tick};
static struct tcp_tw_bucket *tcp_twcal_row[TCP_TW_RECYCLE_SLOTS]; static struct tcp_tw_bucket *tcp_twcal_row[TCP_TW_RECYCLE_SLOTS];
void tcp_tw_schedule(struct tcp_tw_bucket *tw, int timeo) void tcp_tw_schedule(struct tcp_tw_bucket *tw, int timeo)
......
...@@ -94,7 +94,7 @@ rwlock_t addrconf_lock = RW_LOCK_UNLOCKED; ...@@ -94,7 +94,7 @@ rwlock_t addrconf_lock = RW_LOCK_UNLOCKED;
static void addrconf_verify(unsigned long); static void addrconf_verify(unsigned long);
static struct timer_list addr_chk_timer = { function: addrconf_verify }; static struct timer_list addr_chk_timer = { .function = addrconf_verify };
static spinlock_t addrconf_verify_lock = SPIN_LOCK_UNLOCKED; static spinlock_t addrconf_verify_lock = SPIN_LOCK_UNLOCKED;
static int addrconf_ifdown(struct net_device *dev, int how); static int addrconf_ifdown(struct net_device *dev, int how);
......
...@@ -93,7 +93,7 @@ static struct fib6_node * fib6_repair_tree(struct fib6_node *fn); ...@@ -93,7 +93,7 @@ static struct fib6_node * fib6_repair_tree(struct fib6_node *fn);
static __u32 rt_sernum = 0; static __u32 rt_sernum = 0;
static struct timer_list ip6_fib_timer = { function: fib6_run_gc }; static struct timer_list ip6_fib_timer = { .function = fib6_run_gc };
static struct fib6_walker_t fib6_walker_list = { static struct fib6_walker_t fib6_walker_list = {
&fib6_walker_list, &fib6_walker_list, &fib6_walker_list, &fib6_walker_list,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment