diff options
| author | Max Khon <fjoe@FreeBSD.org> | 2014-02-09 10:48:30 +0000 |
|---|---|---|
| committer | Max Khon <fjoe@FreeBSD.org> | 2014-02-09 10:48:30 +0000 |
| commit | 4af7a30193728fcf4875a27918940092ac0ab13b (patch) | |
| tree | 5f4a4524f8fc75e9f6b52fd3d2c075e17569774d /misc/dahdi-kmod26 | |
| parent | Fix FreeBSD 10 (and later) compilation patch (FreeBSD version check). (diff) | |
Unbreak on -CURRENT: M_DONTWAIT -> M_NOWAIT.
Notes
Notes:
svn path=/head/; revision=343454
Diffstat (limited to 'misc/dahdi-kmod26')
| -rw-r--r-- | misc/dahdi-kmod26/files/patch-mbuf | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/misc/dahdi-kmod26/files/patch-mbuf b/misc/dahdi-kmod26/files/patch-mbuf new file mode 100644 index 000000000000..b604fd534deb --- /dev/null +++ b/misc/dahdi-kmod26/files/patch-mbuf @@ -0,0 +1,33 @@ +--- drivers/dahdi/dahdi_dynamic_eth.c.orig 2014-02-09 13:10:00.000000000 +0700 ++++ drivers/dahdi/dahdi_dynamic_eth.c 2014-02-09 13:10:34.000000000 +0700 +@@ -191,10 +191,10 @@ + dev = z->dev; + spin_unlock_irqrestore(&zlock, flags); + #if defined(__FreeBSD__) +- MGETHDR(m, M_DONTWAIT, MT_DATA); ++ MGETHDR(m, M_NOWAIT, MT_DATA); + if (m != NULL) { + if (sizeof(eh) + sizeof(zh) + msglen >= MINCLSIZE) { +- MCLGET(m, M_DONTWAIT); ++ MCLGET(m, M_NOWAIT); + } + + /* copy ethernet header */ +--- drivers/dahdi/dahdi_dynamic_ethmf.c.orig 2014-02-09 13:10:51.000000000 +0700 ++++ drivers/dahdi/dahdi_dynamic_ethmf.c 2014-02-09 13:11:10.000000000 +0700 +@@ -494,13 +494,13 @@ + } + + #if defined(__FreeBSD__) +- MGETHDR(m, M_DONTWAIT, MT_DATA); ++ MGETHDR(m, M_NOWAIT, MT_DATA); + if (m == NULL) { + rcu_read_unlock(); + ethmf_errors_inc(); + return; + } +- MCLGET(m, M_DONTWAIT); ++ MCLGET(m, M_NOWAIT); + + /* copy ethernet header and reserve space for ztdeth header */ + bcopy(dev->dev_addr, &eh.ether_shost, sizeof(eh.ether_shost)); |