ath9k: Add debug counters for TX

[mv-sheeva.git] / drivers / net / cnic.c

diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index 8d740376bbd2fdf0281be31964fe24b7324a4b9e..4d1515f45ba24657777370c151eb26e475f9b85e 100644 (file)
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -1454,6 +1454,7 @@ static inline u16 cnic_get_vlan(struct net_device *dev,
 static 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 sockaddr_in *dst_addr,
        if (!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_sock *csk, struct cnic_sockaddr *saddr)
        clear_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)
@@ -2515,9 +2519,9 @@ static struct cnic_dev *init_bnx2_cnic(struct net_device *dev)
        struct cnic_dev *cdev;
        struct cnic_local *cp;
        struct cnic_eth_dev *ethdev = NULL;
-       struct cnic_eth_dev *(*probe)(void *) = NULL;
+       struct cnic_eth_dev *(*probe)(struct net_device *) = NULL;
 
-       probe = __symbol_get("bnx2_cnic_probe");
+       probe = symbol_get(bnx2_cnic_probe);
        if (probe) {
                ethdev = (*probe)(dev);
                symbol_put_addr(probe);