Skip to content

Commit

Permalink
cxgb3: Handle NULL dst neighbour in cxgb3_offload.c
Browse files Browse the repository at this point in the history
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David Miller committed Dec 5, 2011
1 parent a475712 commit c4be62a
Showing 1 changed file with 15 additions and 3 deletions.
18 changes: 15 additions & 3 deletions drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
Original file line number Diff line number Diff line change
@@ -1072,8 +1072,11 @@ static int is_offloading(struct net_device *dev)

static void cxgb_neigh_update(struct neighbour *neigh)
{
struct net_device *dev = neigh->dev;
struct net_device *dev;

if (!neigh)
return;
dev = neigh->dev;
if (dev && (is_offloading(dev))) {
struct t3cdev *tdev = dev2t3cdev(dev);

@@ -1107,15 +1110,24 @@ static void set_l2t_ix(struct t3cdev *tdev, u32 tid, struct l2t_entry *e)
static void cxgb_redirect(struct dst_entry *old, struct dst_entry *new)
{
struct net_device *olddev, *newdev;
struct neighbour *n;
struct tid_info *ti;
struct t3cdev *tdev;
u32 tid;
int update_tcb;
struct l2t_entry *e;
struct t3c_tid_entry *te;

olddev = dst_get_neighbour_noref(old)->dev;
newdev = dst_get_neighbour_noref(new)->dev;
n = dst_get_neighbour_noref(old);
if (!n)
return;
olddev = n->dev;

n = dst_get_neighbour_noref(new);
if (!n)
return;
newdev = n->dev;

if (!is_offloading(olddev))
return;
if (!is_offloading(newdev)) {

0 comments on commit c4be62a

Please sign in to comment.