diff options
Diffstat (limited to 'net/ipv4/ipmr.c')
-rw-r--r-- | net/ipv4/ipmr.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 65d421cf5bc7..c43ec2d51ce2 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c | |||
@@ -99,10 +99,6 @@ static int ipmr_cache_report(struct net *net, | |||
99 | struct sk_buff *pkt, vifi_t vifi, int assert); | 99 | struct sk_buff *pkt, vifi_t vifi, int assert); |
100 | static int ipmr_fill_mroute(struct sk_buff *skb, struct mfc_cache *c, struct rtmsg *rtm); | 100 | static int ipmr_fill_mroute(struct sk_buff *skb, struct mfc_cache *c, struct rtmsg *rtm); |
101 | 101 | ||
102 | #ifdef CONFIG_IP_PIMSM_V2 | ||
103 | static struct net_protocol pim_protocol; | ||
104 | #endif | ||
105 | |||
106 | static struct timer_list ipmr_expire_timer; | 102 | static struct timer_list ipmr_expire_timer; |
107 | 103 | ||
108 | /* Service routines creating virtual interfaces: DVMRP tunnels and PIMREG */ | 104 | /* Service routines creating virtual interfaces: DVMRP tunnels and PIMREG */ |
@@ -1945,7 +1941,7 @@ static const struct file_operations ipmr_mfc_fops = { | |||
1945 | #endif | 1941 | #endif |
1946 | 1942 | ||
1947 | #ifdef CONFIG_IP_PIMSM_V2 | 1943 | #ifdef CONFIG_IP_PIMSM_V2 |
1948 | static struct net_protocol pim_protocol = { | 1944 | static const struct net_protocol pim_protocol = { |
1949 | .handler = pim_rcv, | 1945 | .handler = pim_rcv, |
1950 | .netns_ok = 1, | 1946 | .netns_ok = 1, |
1951 | }; | 1947 | }; |