cxgb3: Handle NULL dst neighbour in cxgb3_offload.c
authorDavid Miller <davem@davemloft.net>
Fri, 2 Dec 2011 16:52:22 +0000 (16:52 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 5 Dec 2011 20:20:19 +0000 (15:20 -0500)
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c

index 596cfe3..65e4b28 100644 (file)
@@ -1072,8 +1072,11 @@ static int is_offloading(struct net_device *dev)
 
 static void cxgb_neigh_update(struct neighbour *neigh)
 {
 
 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);
 
        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;
 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;
        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;
 
        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)) {
        if (!is_offloading(olddev))
                return;
        if (!is_offloading(newdev)) {