cnic: fix build for INET=n or IPV6=m
Subsystems (2)
PATCH 1/1 cnic: fix build for INET=n or IPV6=m
From: Randy Dunlap <[email protected]>
Fix cnic build for case of CONFIG_INET=n.
Fix cnic build for case of CONFIG_IPV6=m and CONFIG_CNIC=y.
Fixes these build errors (from different builds):
cnic.c:(.text+0x236a1d): undefined reference to ip_route_output_key' cnic.c:(.text+0x15a8e8): undefined reference to ip6_route_output'
Signed-off-by Randy Dunlap <[email protected]>
--- drivers/net/cnic.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/cnic.c +6 -2
@@ -1454,6 +1454,7 @@ static inline u16 cnic_get_vlan(struct nstatic int cnic_get_v4_route (struct sockaddr_in *dst_addr,struct dst_entry **dst) { +#if defined(CONFIG_INET )struct flowi fl;int err;struct rtable *rt;
@@ -1465,12 +1466,15 @@ static int cnic_get_v4_route(struct sockif (!err) *dst = &rt->u.dst;return err; +#else +return -ENETUNREACH ; +#endif }static int cnic_get_v6_route (struct sockaddr_in6 *dst_addr,struct dst_entry **dst) { -#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE ) +#if defined(CONFIG_IPV6 ) || (defined(CONFIG_IPV6_MODULE ) && defined(MODULE ))struct flowi fl;memset (&fl,0 ,sizeof (fl));
@@ -1550,7 +1554,7 @@ static int cnic_get_route(struct cnic_soclear_bit (SK_F_IPV6 , &csk->flags);if (is_v6) { -#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE ) +#if defined(CONFIG_IPV6 ) || (defined(CONFIG_IPV6_MODULE ) && defined(MODULE ))set_bit (SK_F_IPV6 , &csk->flags); err =cnic_get_v6_route (&saddr->remote.v6, &dst);if (err)
Signature · 3 lines
~Randy LPC 2009, Sept. 23-25, Portland, Oregon http://linuxplumbersconf.org/2009/
Quoted 11 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
Fix cnic build for case of
CONFIG_INET=n.
Fix cnic build for case ofCONFIG_IPV6=mandCONFIG_CNIC=y.Fixes these build errors (from different builds):
cnic.c:(.text+0x236a1d): undefined reference to
ip_route_output_key' cnic.c:(.text+0x15a8e8): undefined reference toip6_route_output'Signed-off-by Randy Dunlap <[email protected]>
Acked-by Michael Chan <[email protected]>
Thanks.
Quoted 41 lines
--- drivers/net/cnic.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/net/cnic.c +6
-2@@ -1454,6 +1454,7 @@ static inline u16 cnic_get_vlan(struct nstatic int cnic_get_v4_route (struct sockaddr_in *dst_addr,struct dst_entry **dst) { +#if defined(CONFIG_INET )struct flowi fl;int err;struct rtable *rt;@@ -1465,12 +1466,15 @@ static int cnic_get_v4_route(struct sockif (!err) *dst = &rt->u.dst;return err; +#else +return -ENETUNREACH ; +#endif }static int cnic_get_v6_route (struct sockaddr_in6 *dst_addr,struct dst_entry **dst) { -#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE ) +#if defined(CONFIG_IPV6 ) || (defined(CONFIG_IPV6_MODULE ) && defined(MODULE ))struct flowi fl;memset (&fl,0 ,sizeof (fl));@@ -1550,7 +1554,7 @@ static int cnic_get_route(struct cnic_soclear_bit (SK_F_IPV6 , &csk->flags);if (is_v6) { -#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE ) +#if defined(CONFIG_IPV6 ) || (defined(CONFIG_IPV6_MODULE ) && defined(MODULE ))set_bit (SK_F_IPV6 , &csk->flags); err =cnic_get_v6_route (&saddr->remote.v6, &dst);if (err)