diff options
| author | glebius <glebius@FreeBSD.org> | 2004-08-01 20:39:33 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2004-08-01 20:39:33 +0000 |
| commit | c336444cf25c01f14e1caf4b3f2145e2b4fbb908 (patch) | |
| tree | be96c169e432db4b2971ed25d875eb054ddefef5 /sys/netgraph | |
| parent | 7e43cdbd1b61583ac2b1dcf6f4dbae2daae5bc7c (diff) | |
| download | FreeBSD-src-c336444cf25c01f14e1caf4b3f2145e2b4fbb908.zip FreeBSD-src-c336444cf25c01f14e1caf4b3f2145e2b4fbb908.tar.gz | |
Another stupid error from my side. PPPOE_NONSTANDARD was first defined
in enum {}, and then redefined with #define.
No warnings from compiler, though.
Submitted by: bz
Pointy hat to: glebius
Diffstat (limited to 'sys/netgraph')
| -rw-r--r-- | sys/netgraph/ng_pppoe.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/netgraph/ng_pppoe.c b/sys/netgraph/ng_pppoe.c index 4a29a71..1443287 100644 --- a/sys/netgraph/ng_pppoe.c +++ b/sys/netgraph/ng_pppoe.c @@ -246,9 +246,9 @@ enum { }; struct ng_pppoe_mode_t { - u_int8_t id; + u_int8_t id; const struct ether_header *eh_prototype; - const char *name; + const char *name; }; static const struct ether_header eh_standard = @@ -283,10 +283,10 @@ struct PPPOE { typedef struct PPPOE *priv_p; /* Deprecated sysctl, leaved here to keep compatibility for some time */ -#define PPPOE_KEEPSTANDARD -1 -#define PPPOE_STANDARD 0 -#define PPPOE_NONSTANDARD 1 -static int pppoe_mode = PPPOE_KEEPSTANDARD; +#define PPPOE_SYSCTL_KEEPSTANDARD -1 +#define PPPOE_SYSCTL_STANDARD 0 +#define PPPOE_SYSCTL_NONSTANDARD 1 +static int pppoe_mode = PPPOE_SYSCTL_KEEPSTANDARD; static const struct ng_pppoe_mode_t *sysctl_mode = ng_pppoe_modes; static int @@ -300,11 +300,11 @@ ngpppoe_set_ethertype(SYSCTL_HANDLER_ARGS) if (error != 0 || req->newptr == NULL) return (error); switch (val) { - case PPPOE_NONSTANDARD: + case PPPOE_SYSCTL_NONSTANDARD: sysctl_mode = ng_pppoe_modes + 1; break; - case PPPOE_STANDARD: - case PPPOE_KEEPSTANDARD: + case PPPOE_SYSCTL_STANDARD: + case PPPOE_SYSCTL_KEEPSTANDARD: sysctl_mode = ng_pppoe_modes; break; default: |
