diff options
| author | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2009-07-16 22:58:46 +0000 |
|---|---|---|
| committer | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2009-07-16 22:58:46 +0000 |
| commit | f2bda77e99ac0a80c53ba0f0c4ac3b41c5f13127 (patch) | |
| tree | 3a0e93a17353315d244ac940a7d25b165796a2f1 /sys | |
| parent | babee95f8c92a8abbcc265ddd37988d296c76a6e (diff) | |
Backout rev1.79 of if_vlan.c and rev1.66 of if_trunk.c;
Changes in those revision limited the send queue to one slot.
This breaks NFS over vlan(4) has discovered by sthen@.
"just plain back it out." deraadt@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/if_trunk.c | 4 | ||||
| -rw-r--r-- | sys/net/if_vlan.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/net/if_trunk.c b/sys/net/if_trunk.c index b1fc9014914..a070d4fb53d 100644 --- a/sys/net/if_trunk.c +++ b/sys/net/if_trunk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_trunk.c,v 1.66 2009/07/13 12:39:22 dlg Exp $ */ +/* $OpenBSD: if_trunk.c,v 1.67 2009/07/16 22:58:45 thib Exp $ */ /* * Copyright (c) 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org> @@ -197,7 +197,7 @@ trunk_clone_create(struct if_clone *ifc, int unit) ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST; ifp->if_capabilities = trunk_capabilities(tr); - IFQ_SET_MAXLEN(&ifp->if_snd, 1); + IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen); IFQ_SET_READY(&ifp->if_snd); snprintf(ifp->if_xname, sizeof(ifp->if_xname), "%s%d", diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 43fd6b13af1..c9fd3ddd7b1 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vlan.c,v 1.79 2009/07/13 12:39:22 dlg Exp $ */ +/* $OpenBSD: if_vlan.c,v 1.80 2009/07/16 22:58:45 thib Exp $ */ /* * Copyright 1998 Massachusetts Institute of Technology @@ -133,7 +133,7 @@ vlan_clone_create(struct if_clone *ifc, int unit) ifp->if_start = vlan_start; ifp->if_ioctl = vlan_ioctl; ifp->if_output = ether_output; - IFQ_SET_MAXLEN(&ifp->if_snd, 1); + IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen); IFQ_SET_READY(&ifp->if_snd); if_attach(ifp); ether_ifattach(ifp); |