Commit 44b7532b authored by Linus Torvalds's avatar Linus Torvalds

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] cnic: fix error: implicit declaration of function ‘__symbol_get’
  [SCSI] cnic: fix undefined reference to `ip6_route_output'
parents 84c48e6f bc3bf8fd
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/ethtool.h> #include <linux/ethtool.h>
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/module.h>
#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
#define BCM_VLAN 1 #define BCM_VLAN 1
#endif #endif
...@@ -1454,6 +1456,7 @@ static inline u16 cnic_get_vlan(struct net_device *dev, ...@@ -1454,6 +1456,7 @@ static inline u16 cnic_get_vlan(struct net_device *dev,
static int cnic_get_v4_route(struct sockaddr_in *dst_addr, static int cnic_get_v4_route(struct sockaddr_in *dst_addr,
struct dst_entry **dst) struct dst_entry **dst)
{ {
#if defined(CONFIG_INET)
struct flowi fl; struct flowi fl;
int err; int err;
struct rtable *rt; struct rtable *rt;
...@@ -1465,12 +1468,15 @@ static int cnic_get_v4_route(struct sockaddr_in *dst_addr, ...@@ -1465,12 +1468,15 @@ static int cnic_get_v4_route(struct sockaddr_in *dst_addr,
if (!err) if (!err)
*dst = &rt->u.dst; *dst = &rt->u.dst;
return err; return err;
#else
return -ENETUNREACH;
#endif
} }
static int cnic_get_v6_route(struct sockaddr_in6 *dst_addr, static int cnic_get_v6_route(struct sockaddr_in6 *dst_addr,
struct dst_entry **dst) 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; struct flowi fl;
memset(&fl, 0, sizeof(fl)); memset(&fl, 0, sizeof(fl));
...@@ -1550,7 +1556,7 @@ static int cnic_get_route(struct cnic_sock *csk, struct cnic_sockaddr *saddr) ...@@ -1550,7 +1556,7 @@ static int cnic_get_route(struct cnic_sock *csk, struct cnic_sockaddr *saddr)
clear_bit(SK_F_IPV6, &csk->flags); clear_bit(SK_F_IPV6, &csk->flags);
if (is_v6) { 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); set_bit(SK_F_IPV6, &csk->flags);
err = cnic_get_v6_route(&saddr->remote.v6, &dst); err = cnic_get_v6_route(&saddr->remote.v6, &dst);
if (err) if (err)
......
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