diff options
| author | David S. Miller <davem@davemloft.net> | 2016-04-24 21:32:05 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-24 21:32:05 +0300 |
| commit | b6742cab0d79708d54774ce615c8c96ad71ce40b (patch) | |
| tree | 5f64306347f47ef4b657f43a661a71bb907c0b4d /include/uapi/linux | |
| parent | 3d05a06d313d602f7cd589d5d8d45bd04902adcb (diff) | |
| parent | 4b1fb9352f351faa067a914907d58a6fe38ac048 (diff) | |
| download | linux-b6742cab0d79708d54774ce615c8c96ad71ce40b.tar.xz | |
Merge branch 'macsec-fixes'
Sabrina Dubroca says:
====================
macsec: a few fixes
Some small fixes for the macsec driver:
- possible NULL pointer dereferences
- netlink dumps fixes: RTNL locking, consistent dumps
- a reference counting bug
- wrong name for uapi constant
- a few memory leaks
Patches 1 to 5 are the same as in v1, patches 6 to 9 are new.
Patch 6 fixes the memleak that Lance spotted in v1.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/if_macsec.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/if_macsec.h b/include/uapi/linux/if_macsec.h index 26b0d1e3e3e7..4c58d9917aa4 100644 --- a/include/uapi/linux/if_macsec.h +++ b/include/uapi/linux/if_macsec.h @@ -19,8 +19,8 @@ #define MACSEC_MAX_KEY_LEN 128 -#define DEFAULT_CIPHER_ID 0x0080020001000001ULL -#define DEFAULT_CIPHER_ALT 0x0080C20001000001ULL +#define MACSEC_DEFAULT_CIPHER_ID 0x0080020001000001ULL +#define MACSEC_DEFAULT_CIPHER_ALT 0x0080C20001000001ULL #define MACSEC_MIN_ICV_LEN 8 #define MACSEC_MAX_ICV_LEN 32 |