26c26
< * $FreeBSD: head/sys/net/if_ef.c 111790 2003-03-03 05:04:57Z mdodd $
---
> * $FreeBSD: head/sys/net/if_ef.c 111888 2003-03-04 23:19:55Z jlemon $
243,244c243
< ef_inputEII(struct mbuf *m, struct ether_header *eh,
< u_short ether_type, struct ifqueue **inq)
---
> ef_inputEII(struct mbuf *m, struct ether_header *eh, u_short ether_type)
245a245,246
> int isr;
>
248,250c249,250
< case ETHERTYPE_IPX:
< schednetisr(NETISR_IPX);
< *inq = &ipxintrq;
---
> case ETHERTYPE_IPX:
> isr = NETISR_IPX;
254c254
< case ETHERTYPE_IP:
---
> case ETHERTYPE_IP:
256,258c256,257
< return 1;
< schednetisr(NETISR_IP);
< *inq = &ipintrq;
---
> return (0);
> isr = NETISR_IP;
261,263c260,261
< case ETHERTYPE_ARP:
< schednetisr(NETISR_ARP);
< *inq = &arpintrq;
---
> case ETHERTYPE_ARP:
> isr = NETISR_ARP;
266,267c264,265
< default:
< return EPROTONOSUPPORT;
---
> default:
> return (EPROTONOSUPPORT);
269c267,268
< return 0;
---
> netisr_dispatch(isr, m);
> return (0);
274c273
< u_short ether_type, struct ifqueue **inq)
---
> u_short ether_type)
275a275,276
> int isr;
>
278c279
< case ETHERTYPE_IPX:
---
> case ETHERTYPE_IPX:
280,281c281
< schednetisr(NETISR_IPX);
< *inq = &ipxintrq;
---
> isr = NETISR_IPX;
284,285c284,285
< default:
< return EPROTONOSUPPORT;
---
> default:
> return (EPROTONOSUPPORT);
287c287,288
< return 0;
---
> netisr_dispatch(isr, m);
> return (0);
292c293
< u_short ether_type, struct ifqueue **inq)
---
> u_short ether_type)
293a295,296
> int isr;
>
296c299
< case 0xe0:
---
> case 0xe0:
298,299c301
< schednetisr(NETISR_IPX);
< *inq = &ipxintrq;
---
> isr = NETISR_IPX;
302,303c304,305
< default:
< return EPROTONOSUPPORT;
---
> default:
> return (EPROTONOSUPPORT);
305c307,308
< return 0;
---
> netisr_dispatch(isr, m);
> return (0);
306a310
>
315d318
< struct ifqueue *inq;
319a323
> int isr;
380d383
< inq = NULL;
382,384c385,386
< case ETHER_FT_EII:
< if (ef_inputEII(m, eh, ether_type, &inq) != 0)
< return EPROTONOSUPPORT;
---
> case ETHER_FT_EII:
> return (ef_inputEII(m, eh, ether_type));
387,389c389,390
< case ETHER_FT_8023: /* only IPX can be here */
< schednetisr(NETISR_IPX);
< inq = &ipxintrq;
---
> case ETHER_FT_8023: /* only IPX can be here */
> isr = NETISR_IPX;
392,394c393,394
< case ETHER_FT_SNAP:
< if (ef_inputSNAP(m, eh, l, ether_type, &inq) != 0)
< return EPROTONOSUPPORT;
---
> case ETHER_FT_SNAP:
> return (ef_inputSNAP(m, eh, l, ether_type));
396,398c396,397
< case ETHER_FT_8022:
< if (ef_input8022(m, eh, l, ether_type, &inq) != 0)
< return EPROTONOSUPPORT;
---
> case ETHER_FT_8022:
> return (ef_input8022(m, eh, l, ether_type));
400,402c399
< }
<
< if (inq == NULL) {
---
> default:
405c402
< return EPROTONOSUPPORT;
---
> return (EPROTONOSUPPORT);
407,408c404,405
< (void) IF_HANDOFF(inq, m, NULL);
< return 0;
---
> netisr_dispatch(isr, m);
> return (0);