leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cxgb3: Handle NULL dst neighbour in cxgb3_offload.c

Browse Source 
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David Miller 2011-12-02 16:52:22 +00:00 committed by David S. Miller
parent a4757123ae
commit c4be62a4d2
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
View File

@ -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,6 +1110,7 @@ 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;
@ -1114,8 +1118,16 @@ static void cxgb_redirect(struct dst_entry *old, struct dst_entry *new)
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)) {