lkml.org 
[lkml]   [2009]   [Jun]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[GIT PULL] a couple of SCSI bug fixes from the last update
    From
    Date
    This just fixes up a couple of config based problems in the cnic driver
    (which is the broadcom iSCSI base).

    The patch is available here:

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

    The short changelog:

    Ingo Molnar (1):
    cnic: fix error: implicit declaration of function ‘__symbol_get’

    Randy Dunlap (1):
    cnic: fix undefined reference to `ip6_route_output'

    and the diffstat:

    drivers/net/cnic.c | 10 ++++++++--
    1 file changed, 8 insertions(+), 2 deletions(-)

    Full diff below

    James

    ---

    diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
    index 8d74037..44f77eb 100644
    --- a/drivers/net/cnic.c
    +++ b/drivers/net/cnic.c
    @@ -25,6 +25,8 @@
    #include <linux/delay.h>
    #include <linux/ethtool.h>
    #include <linux/if_vlan.h>
    +#include <linux/module.h>
    +
    #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
    #define BCM_VLAN 1
    #endif
    @@ -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,
    struct dst_entry **dst)
    {
    +#if defined(CONFIG_INET)
    struct flowi fl;
    int err;
    struct rtable *rt;
    @@ -1465,12 +1468,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 +1556,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)


    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2009-06-13 19:59    [W:0.025 / U:62.128 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site