diff options
| author | David Miller <davem@davemloft.net> | 2011-12-02 16:52:39 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-05 15:20:20 -0500 |
| commit | 51e059bdd62f8da90973edf8a6180bd2c080f866 (patch) | |
| tree | bdc291e7b6230e34ae26eae6f0bc689bb8b7967b /drivers/scsi/cxgbi | |
| parent | a58b61e5b79bc9ce5f8d7b0cd03e8c6525c657f8 (diff) | |
| download | talos-op-linux-51e059bdd62f8da90973edf8a6180bd2c080f866.tar.gz talos-op-linux-51e059bdd62f8da90973edf8a6180bd2c080f866.zip | |
cxgb4i: Handle dst_get_neighbour_noref() returning NULL.
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/scsi/cxgbi')
| -rw-r--r-- | drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c index c8fd13aadf9c..5a4a3bfc60cf 100644 --- a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c +++ b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c @@ -1127,6 +1127,7 @@ static int init_act_open(struct cxgbi_sock *csk) struct net_device *ndev = cdev->ports[csk->port_id]; struct port_info *pi = netdev_priv(ndev); struct sk_buff *skb = NULL; + struct neighbour *n; unsigned int step; log_debug(1 << CXGBI_DBG_TOE | 1 << CXGBI_DBG_SOCK, @@ -1141,7 +1142,12 @@ static int init_act_open(struct cxgbi_sock *csk) cxgbi_sock_set_flag(csk, CTPF_HAS_ATID); cxgbi_sock_get(csk); - csk->l2t = cxgb4_l2t_get(lldi->l2t, dst_get_neighbour_noref(csk->dst), ndev, 0); + n = dst_get_neighbour_noref(csk->dst); + if (!n) { + pr_err("%s, can't get neighbour of csk->dst.\n", ndev->name); + goto rel_resource; + } + csk->l2t = cxgb4_l2t_get(lldi->l2t, n, ndev, 0); if (!csk->l2t) { pr_err("%s, cannot alloc l2t.\n", ndev->name); goto rel_resource; |
