---

yaml --- r: 201085 b: refs/heads/master c: 91a72a7 h: refs/heads/master i: 201083: 379b98a v: v3
git-mirror · Jul 15, 2010 · ecb92bd · ecb92bd
1 parent e2de5f7
commit ecb92bd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87fd308cfc6b2e880bf717a740bd5c58d2aed10c
+refs/heads/master: 91a72a70594e5212c97705ca6a694bd307f7a26b
diff --git a/trunk/net/core/neighbour.c b/trunk/net/core/neighbour.c
@@ -949,7 +949,10 @@ static void neigh_update_hhs(struct neighbour *neigh)
 {
 	struct hh_cache *hh;
 	void (*update)(struct hh_cache*, const struct net_device*, const unsigned char *)
-		= neigh->dev->header_ops->cache_update;
+		= NULL;
+
+	if (neigh->dev->header_ops)
+		update = neigh->dev->header_ops->cache_update;
 
 	if (update) {
 		for (hh = neigh->hh; hh; hh = hh->hh_next) {