Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the body of VLAN_INPUT_TAG() into a static inline function. 

(Maybe it shouldn't even be inline - but I'd have to work out where to put it).
VLAN_INPUT_TAG() now calls vlan_input_tag() and does '_errcase' when it fails.
In reality the callers should all be changed, _errcase is ALWAYS continue,
which used to 'continue' (ie break) the do .. while (0) loop - not the
intended action!
Found by ramming all the kernel sources through a modified lint and grepping
for a specific error.
While here enclose the body of VLAN_OUTPUT_TAG() in ().
This commit is contained in:
dsl 2008-07-25 20:04:50 +00:00
parent 93b2e677b4
commit 34519fcf41
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
sys/net/if_ether.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ether.h,v 1.52 2008/07/25 15:10:25 christos Exp $ */
/* $NetBSD: if_ether.h,v 1.53 2008/07/25 20:04:50 dsl Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@ -256,24 +256,31 @@ struct ether_multistep {
*/
/* add VLAN tag to input/received packet */
static inline int vlan_input_tag(struct ifnet *, struct mbuf *, u_int);
static inline int
vlan_input_tag(struct ifnet *ifp, struct mbuf *m, u_int vlanid)
{
struct m_tag *mtag;
mtag = m_tag_get(PACKET_TAG_VLAN, sizeof(u_int), M_NOWAIT);
if (mtag == NULL) {
ifp->if_ierrors++;
printf("%s: unable to allocate VLAN tag\n", ifp->if_xname);
m_freem(m);
return 1;
}
*(u_int *)(mtag + 1) = vlanid;
m_tag_prepend(m, mtag);
return 0;
}
#define VLAN_INPUT_TAG(ifp, m, vlanid, _errcase) \
do { \
struct m_tag *mtag = \
m_tag_get(PACKET_TAG_VLAN, sizeof(u_int), M_NOWAIT);\
if (mtag == NULL) { \
ifp->if_ierrors++; \
printf("%s: unable to allocate VLAN tag\n", \
ifp->if_xname); \
m_freem(m); \
if (vlan_input_tag(ifp, m, vlanid) != 0) { \
_errcase; \
} \
*(u_int *)(mtag + 1) = vlanid; \
m_tag_prepend(m, mtag); \
} while(0)
}
/* extract VLAN tag from output/trasmit packet */
#define VLAN_OUTPUT_TAG(ec, m0) \
VLAN_ATTACHED(ec) ? m_tag_find((m0), PACKET_TAG_VLAN, NULL) : NULL
(VLAN_ATTACHED(ec) ? m_tag_find((m0), PACKET_TAG_VLAN, NULL) : NULL)
/* extract VLAN ID value from a VLAN tag */
#define VLAN_TAG_VALUE(mtag) \