From ecb92bd0611d925e2d783e4dc0b47c22d36b737c Mon Sep 17 00:00:00 2001
From: Doug Kehn <rdkehn@yahoo.com>
Date: Wed, 14 Jul 2010 18:02:16 -0700
Subject: [PATCH] --- yaml --- r: 201085 b: refs/heads/master c:
 91a72a70594e5212c97705ca6a694bd307f7a26b h: refs/heads/master i:   201083:
 379b98a30f40a7b39f65cb4ddadf9f4e6abb8f92 v: v3

---
 [refs]                     | 2 +-
 trunk/net/core/neighbour.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2cc7f0588302..3d445658ce7c 100644
--- 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
index 6ba1c0eece03..a4e0a7482c2b 100644
--- 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) {