diff options
| author | Renato Botelho <renato@netgate.com> | 2016-04-18 08:18:18 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-04-18 08:18:18 -0300 |
| commit | 1217ad91c5e7f6d7b4b48a459e1a9ec1c24b4a83 (patch) | |
| tree | 029e52b2581abc2887c924b779e8a3df809f1658 /sys/net/if_bridge.c | |
| parent | b68c53e36b81c9db70247b33bd565da3ce225608 (diff) | |
| parent | d47609db9b6e0c2e5ca7eb4f181cc7b031dc2f37 (diff) | |
| download | FreeBSD-src-1217ad91c5e7f6d7b4b48a459e1a9ec1c24b4a83.zip FreeBSD-src-1217ad91c5e7f6d7b4b48a459e1a9ec1c24b4a83.tar.gz | |
Merge remote-tracking branch 'origin/master' into devel-11
Diffstat (limited to 'sys/net/if_bridge.c')
| -rw-r--r-- | sys/net/if_bridge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 0e810e3..00621c7 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -3252,7 +3252,7 @@ bridge_pfil(struct mbuf **mp, struct ifnet *bifp, struct ifnet *ifp, int dir) if (hlen < sizeof(struct ip)) goto bad; if (hlen > (*mp)->m_len) { - if ((*mp = m_pullup(*mp, hlen)) == 0) + if ((*mp = m_pullup(*mp, hlen)) == NULL) goto bad; ip = mtod(*mp, struct ip *); if (ip == NULL) @@ -3370,7 +3370,7 @@ bridge_ip_checkbasic(struct mbuf **mp) goto bad; } if (hlen > m->m_len) { - if ((m = m_pullup(m, hlen)) == 0) { + if ((m = m_pullup(m, hlen)) == NULL) { KMOD_IPSTAT_INC(ips_badhlen); goto bad; } |
