Merge remote-tracking branch 'upstream/master'

Conflicts:
	Makefile
	brmon.c

diff --cc Makefile
Simple merge

diff --cc bridge_track.c
index c68593530bfed6853b2e792946fe7c2563fe90b7,f08c9f6af9d4ee6b2f6b240fd369e3d1faec0575..f5efa3ff69c81b12c3b2f9edbfc5bdb14fe91648
--- 1/bridge_track.c
--- 2/bridge_track.c
+++ b/bridge_track.c
@@@ -447,9 -576,10 +447,9 @@@ const unsigned char STP_SAP = 0x42
  void bridge_bpdu_rcv(int if_index, const unsigned char *data, int len)
  {
        struct ifdata *ifc = find_if(if_index);
 -      BPDU_T *bpdu = (BPDU_T *) (data + sizeof(MAC_HEADER_T));
  
        LOG("ifindex %d, len %d", if_index, len);
-       if (!ifc)
+       if (!ifc || !ifc->master)
                return;
  
        TST(ifc->up,);