Re: [RFC PATCHv2 bridge 5/7] bridge: Add vlan support to static neighbors

On 09/19/2012 11:20 AM, John Fastabend wrote:

On 9/19/2012 5:42 AM, Vlad Yasevich wrote:

quoted

---
  include/linux/neighbour.h |    2 +-
  net/bridge/br_fdb.c       |   12 ++++++------
  2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/linux/neighbour.h b/include/linux/neighbour.h
index 275e5d6..044df8f 100644
--- a/include/linux/neighbour.h
+++ b/include/linux/neighbour.h

@@ -7,7 +7,7 @@
  struct ndmsg {
      __u8        ndm_family;
      __u8        ndm_pad1;
-    __u16        ndm_pad2;
+    __u16        ndm_vlan;

But ndm_pad2 is also used in neighbour.c so you'll need to fix that up
as well.

net/core/neighbour.c: In function âneigh_fill_infoâ:
net/core/neighbour.c:2152: error: âstruct ndmsgâ has no member named
ândm_pad2â
net/core/neighbour.c: In function âpneigh_fill_infoâ:
net/core/neighbour.c:2203: error: âstruct ndmsgâ has no member named
ândm_pad2â
make[2]: *** [net/core/neighbour.o] Error 1
make[1]: *** [net/core] Error 2
make[1]: *** Waiting for unfinished jobs....
make: *** [net] Error 2
make: *** Waiting for unfinished jobs....

dough!!!  patches from wrong branch.  sorry about that.

-vlad