X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;ds=sidebyside;f=include%2Frdma%2Fib_addr.h;h=99965395c5f3a5cebb645a67f76681985ce3da84;hb=1ca97bb541a1f5a735e697a8bba763cde3aab452;hp=639a4491fc0dd8fcf4e26931f2c6e8d1c7ed0566;hpb=3298758385bbffa792f009fd965e02203aaf82a2;p=linux-2.6-block.git

diff --git a/include/rdma/ib_addr.h b/include/rdma/ib_addr.h
index 639a4491fc0d..99965395c5f3 100644
--- a/include/rdma/ib_addr.h
+++ b/include/rdma/ib_addr.h
@@ -281,7 +281,7 @@ static inline u16 rdma_get_vlan_id(union ib_gid *dgid)
 static inline struct net_device *rdma_vlan_dev_real_dev(const struct net_device *dev)
 {
 	return dev->priv_flags & IFF_802_1Q_VLAN ?
-		vlan_dev_real_dev(dev) : 0;
+		vlan_dev_real_dev(dev) : NULL;
 }
 
 #endif /* IB_ADDR_H */