Skip to content

Commit 9c9f261

Browse files
davem330davem330
committed
Merge branch 'nla_align-set-4'
Nicolas Dichtel says: ==================== netlink: align attributes when needed (patchset #3) This is the continuation (series #3) of the work done to align netlink attributes when these attributes contain some 64-bit fields. It's the last patchset from what I've seen. The last user of nla_put_u64() is block/drbd. This module does not use standard netlink API (see all the stuff in include/linux/genl_magic_struct.h and include/linux/genl_magic_func.h). I didn't modify it because it's seems hard to do it whithout testing and fully understanding the context (for example, why include/linux/drbd_genl.h is not part of uapi?). Any thoughts? ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents fab7b62 + 9854518 commit 9c9f261

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+211
-98
lines changed

‎Documentation/networking/gen_stats.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ my_dumping_routine(struct sk_buff *skb, ...)
3333
{
3434
struct gnet_dump dump;
3535

36-
if (gnet_stats_start_copy(skb, TCA_STATS2, &mystruct->lock, &dump) < 0)
36+
if (gnet_stats_start_copy(skb, TCA_STATS2, &mystruct->lock, &dump,
37+
TCA_PAD) < 0)
3738
goto rtattr_failure;
3839

3940
if (gnet_stats_copy_basic(&dump, &mystruct->bstats) < 0 ||
@@ -56,7 +57,8 @@ existing TLV types.
5657
my_dumping_routine(struct sk_buff *skb, ...)
5758
{
5859
if (gnet_stats_start_copy_compat(skb, TCA_STATS2, TCA_STATS,
59-
TCA_XSTATS, &mystruct->lock, &dump) < 0)
60+
TCA_XSTATS, &mystruct->lock, &dump,
61+
TCA_PAD) < 0)
6062
goto rtattr_failure;
6163
...
6264
}

‎drivers/net/macsec.c‎

Lines changed: 88 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1405,9 +1405,10 @@ static sci_t nla_get_sci(const struct nlattr *nla)
14051405
return (__force sci_t)nla_get_u64(nla);
14061406
}
14071407

1408-
static int nla_put_sci(struct sk_buff *skb, int attrtype, sci_t value)
1408+
static int nla_put_sci(struct sk_buff *skb, int attrtype, sci_t value,
1409+
int padattr)
14091410
{
1410-
return nla_put_u64(skb, attrtype, (__force u64)value);
1411+
return nla_put_u64_64bit(skb, attrtype, (__force u64)value, padattr);
14111412
}
14121413

14131414
static struct macsec_tx_sa *get_txsa_from_nl(struct net *net,
@@ -2131,16 +2132,36 @@ static int copy_rx_sc_stats(struct sk_buff *skb,
21312132
sum.InPktsUnusedSA += tmp.InPktsUnusedSA;
21322133
}
21332134

2134-
if (nla_put_u64(skb, MACSEC_RXSC_STATS_ATTR_IN_OCTETS_VALIDATED, sum.InOctetsValidated) ||
2135-
nla_put_u64(skb, MACSEC_RXSC_STATS_ATTR_IN_OCTETS_DECRYPTED, sum.InOctetsDecrypted) ||
2136-
nla_put_u64(skb, MACSEC_RXSC_STATS_ATTR_IN_PKTS_UNCHECKED, sum.InPktsUnchecked) ||
2137-
nla_put_u64(skb, MACSEC_RXSC_STATS_ATTR_IN_PKTS_DELAYED, sum.InPktsDelayed) ||
2138-
nla_put_u64(skb, MACSEC_RXSC_STATS_ATTR_IN_PKTS_OK, sum.InPktsOK) ||
2139-
nla_put_u64(skb, MACSEC_RXSC_STATS_ATTR_IN_PKTS_INVALID, sum.InPktsInvalid) ||
2140-
nla_put_u64(skb, MACSEC_RXSC_STATS_ATTR_IN_PKTS_LATE, sum.InPktsLate) ||
2141-
nla_put_u64(skb, MACSEC_RXSC_STATS_ATTR_IN_PKTS_NOT_VALID, sum.InPktsNotValid) ||
2142-
nla_put_u64(skb, MACSEC_RXSC_STATS_ATTR_IN_PKTS_NOT_USING_SA, sum.InPktsNotUsingSA) ||
2143-
nla_put_u64(skb, MACSEC_RXSC_STATS_ATTR_IN_PKTS_UNUSED_SA, sum.InPktsUnusedSA))
2135+
if (nla_put_u64_64bit(skb, MACSEC_RXSC_STATS_ATTR_IN_OCTETS_VALIDATED,
2136+
sum.InOctetsValidated,
2137+
MACSEC_RXSC_STATS_ATTR_PAD) ||
2138+
nla_put_u64_64bit(skb, MACSEC_RXSC_STATS_ATTR_IN_OCTETS_DECRYPTED,
2139+
sum.InOctetsDecrypted,
2140+
MACSEC_RXSC_STATS_ATTR_PAD) ||
2141+
nla_put_u64_64bit(skb, MACSEC_RXSC_STATS_ATTR_IN_PKTS_UNCHECKED,
2142+
sum.InPktsUnchecked,
2143+
MACSEC_RXSC_STATS_ATTR_PAD) ||
2144+
nla_put_u64_64bit(skb, MACSEC_RXSC_STATS_ATTR_IN_PKTS_DELAYED,
2145+
sum.InPktsDelayed,
2146+
MACSEC_RXSC_STATS_ATTR_PAD) ||
2147+
nla_put_u64_64bit(skb, MACSEC_RXSC_STATS_ATTR_IN_PKTS_OK,
2148+
sum.InPktsOK,
2149+
MACSEC_RXSC_STATS_ATTR_PAD) ||
2150+
nla_put_u64_64bit(skb, MACSEC_RXSC_STATS_ATTR_IN_PKTS_INVALID,
2151+
sum.InPktsInvalid,
2152+
MACSEC_RXSC_STATS_ATTR_PAD) ||
2153+
nla_put_u64_64bit(skb, MACSEC_RXSC_STATS_ATTR_IN_PKTS_LATE,
2154+
sum.InPktsLate,
2155+
MACSEC_RXSC_STATS_ATTR_PAD) ||
2156+
nla_put_u64_64bit(skb, MACSEC_RXSC_STATS_ATTR_IN_PKTS_NOT_VALID,
2157+
sum.InPktsNotValid,
2158+
MACSEC_RXSC_STATS_ATTR_PAD) ||
2159+
nla_put_u64_64bit(skb, MACSEC_RXSC_STATS_ATTR_IN_PKTS_NOT_USING_SA,
2160+
sum.InPktsNotUsingSA,
2161+
MACSEC_RXSC_STATS_ATTR_PAD) ||
2162+
nla_put_u64_64bit(skb, MACSEC_RXSC_STATS_ATTR_IN_PKTS_UNUSED_SA,
2163+
sum.InPktsUnusedSA,
2164+
MACSEC_RXSC_STATS_ATTR_PAD))
21442165
return -EMSGSIZE;
21452166

21462167
return 0;
@@ -2169,10 +2190,18 @@ static int copy_tx_sc_stats(struct sk_buff *skb,
21692190
sum.OutOctetsEncrypted += tmp.OutOctetsEncrypted;
21702191
}
21712192

2172-
if (nla_put_u64(skb, MACSEC_TXSC_STATS_ATTR_OUT_PKTS_PROTECTED, sum.OutPktsProtected) ||
2173-
nla_put_u64(skb, MACSEC_TXSC_STATS_ATTR_OUT_PKTS_ENCRYPTED, sum.OutPktsEncrypted) ||
2174-
nla_put_u64(skb, MACSEC_TXSC_STATS_ATTR_OUT_OCTETS_PROTECTED, sum.OutOctetsProtected) ||
2175-
nla_put_u64(skb, MACSEC_TXSC_STATS_ATTR_OUT_OCTETS_ENCRYPTED, sum.OutOctetsEncrypted))
2193+
if (nla_put_u64_64bit(skb, MACSEC_TXSC_STATS_ATTR_OUT_PKTS_PROTECTED,
2194+
sum.OutPktsProtected,
2195+
MACSEC_TXSC_STATS_ATTR_PAD) ||
2196+
nla_put_u64_64bit(skb, MACSEC_TXSC_STATS_ATTR_OUT_PKTS_ENCRYPTED,
2197+
sum.OutPktsEncrypted,
2198+
MACSEC_TXSC_STATS_ATTR_PAD) ||
2199+
nla_put_u64_64bit(skb, MACSEC_TXSC_STATS_ATTR_OUT_OCTETS_PROTECTED,
2200+
sum.OutOctetsProtected,
2201+
MACSEC_TXSC_STATS_ATTR_PAD) ||
2202+
nla_put_u64_64bit(skb, MACSEC_TXSC_STATS_ATTR_OUT_OCTETS_ENCRYPTED,
2203+
sum.OutOctetsEncrypted,
2204+
MACSEC_TXSC_STATS_ATTR_PAD))
21762205
return -EMSGSIZE;
21772206

21782207
return 0;
@@ -2205,14 +2234,30 @@ static int copy_secy_stats(struct sk_buff *skb,
22052234
sum.InPktsOverrun += tmp.InPktsOverrun;
22062235
}
22072236

2208-
if (nla_put_u64(skb, MACSEC_SECY_STATS_ATTR_OUT_PKTS_UNTAGGED, sum.OutPktsUntagged) ||
2209-
nla_put_u64(skb, MACSEC_SECY_STATS_ATTR_IN_PKTS_UNTAGGED, sum.InPktsUntagged) ||
2210-
nla_put_u64(skb, MACSEC_SECY_STATS_ATTR_OUT_PKTS_TOO_LONG, sum.OutPktsTooLong) ||
2211-
nla_put_u64(skb, MACSEC_SECY_STATS_ATTR_IN_PKTS_NO_TAG, sum.InPktsNoTag) ||
2212-
nla_put_u64(skb, MACSEC_SECY_STATS_ATTR_IN_PKTS_BAD_TAG, sum.InPktsBadTag) ||
2213-
nla_put_u64(skb, MACSEC_SECY_STATS_ATTR_IN_PKTS_UNKNOWN_SCI, sum.InPktsUnknownSCI) ||
2214-
nla_put_u64(skb, MACSEC_SECY_STATS_ATTR_IN_PKTS_NO_SCI, sum.InPktsNoSCI) ||
2215-
nla_put_u64(skb, MACSEC_SECY_STATS_ATTR_IN_PKTS_OVERRUN, sum.InPktsOverrun))
2237+
if (nla_put_u64_64bit(skb, MACSEC_SECY_STATS_ATTR_OUT_PKTS_UNTAGGED,
2238+
sum.OutPktsUntagged,
2239+
MACSEC_SECY_STATS_ATTR_PAD) ||
2240+
nla_put_u64_64bit(skb, MACSEC_SECY_STATS_ATTR_IN_PKTS_UNTAGGED,
2241+
sum.InPktsUntagged,
2242+
MACSEC_SECY_STATS_ATTR_PAD) ||
2243+
nla_put_u64_64bit(skb, MACSEC_SECY_STATS_ATTR_OUT_PKTS_TOO_LONG,
2244+
sum.OutPktsTooLong,
2245+
MACSEC_SECY_STATS_ATTR_PAD) ||
2246+
nla_put_u64_64bit(skb, MACSEC_SECY_STATS_ATTR_IN_PKTS_NO_TAG,
2247+
sum.InPktsNoTag,
2248+
MACSEC_SECY_STATS_ATTR_PAD) ||
2249+
nla_put_u64_64bit(skb, MACSEC_SECY_STATS_ATTR_IN_PKTS_BAD_TAG,
2250+
sum.InPktsBadTag,
2251+
MACSEC_SECY_STATS_ATTR_PAD) ||
2252+
nla_put_u64_64bit(skb, MACSEC_SECY_STATS_ATTR_IN_PKTS_UNKNOWN_SCI,
2253+
sum.InPktsUnknownSCI,
2254+
MACSEC_SECY_STATS_ATTR_PAD) ||
2255+
nla_put_u64_64bit(skb, MACSEC_SECY_STATS_ATTR_IN_PKTS_NO_SCI,
2256+
sum.InPktsNoSCI,
2257+
MACSEC_SECY_STATS_ATTR_PAD) ||
2258+
nla_put_u64_64bit(skb, MACSEC_SECY_STATS_ATTR_IN_PKTS_OVERRUN,
2259+
sum.InPktsOverrun,
2260+
MACSEC_SECY_STATS_ATTR_PAD))
22162261
return -EMSGSIZE;
22172262

22182263
return 0;
@@ -2226,8 +2271,11 @@ static int nla_put_secy(struct macsec_secy *secy, struct sk_buff *skb)
22262271
if (!secy_nest)
22272272
return 1;
22282273

2229-
if (nla_put_sci(skb, MACSEC_SECY_ATTR_SCI, secy->sci) ||
2230-
nla_put_u64(skb, MACSEC_SECY_ATTR_CIPHER_SUITE, DEFAULT_CIPHER_ID) ||
2274+
if (nla_put_sci(skb, MACSEC_SECY_ATTR_SCI, secy->sci,
2275+
MACSEC_SECY_ATTR_PAD) ||
2276+
nla_put_u64_64bit(skb, MACSEC_SECY_ATTR_CIPHER_SUITE,
2277+
DEFAULT_CIPHER_ID,
2278+
MACSEC_SECY_ATTR_PAD) ||
22312279
nla_put_u8(skb, MACSEC_SECY_ATTR_ICV_LEN, secy->icv_len) ||
22322280
nla_put_u8(skb, MACSEC_SECY_ATTR_OPER, secy->operational) ||
22332281
nla_put_u8(skb, MACSEC_SECY_ATTR_PROTECT, secy->protect_frames) ||
@@ -2312,7 +2360,9 @@ static int dump_secy(struct macsec_secy *secy, struct net_device *dev,
23122360

23132361
if (nla_put_u8(skb, MACSEC_SA_ATTR_AN, i) ||
23142362
nla_put_u32(skb, MACSEC_SA_ATTR_PN, tx_sa->next_pn) ||
2315-
nla_put_u64(skb, MACSEC_SA_ATTR_KEYID, tx_sa->key.id) ||
2363+
nla_put_u64_64bit(skb, MACSEC_SA_ATTR_KEYID,
2364+
tx_sa->key.id,
2365+
MACSEC_SA_ATTR_PAD) ||
23162366
nla_put_u8(skb, MACSEC_SA_ATTR_ACTIVE, tx_sa->active)) {
23172367
nla_nest_cancel(skb, txsa_nest);
23182368
nla_nest_cancel(skb, txsa_list);
@@ -2353,7 +2403,8 @@ static int dump_secy(struct macsec_secy *secy, struct net_device *dev,
23532403
}
23542404

23552405
if (nla_put_u8(skb, MACSEC_RXSC_ATTR_ACTIVE, rx_sc->active) ||
2356-
nla_put_sci(skb, MACSEC_RXSC_ATTR_SCI, rx_sc->sci)) {
2406+
nla_put_sci(skb, MACSEC_RXSC_ATTR_SCI, rx_sc->sci,
2407+
MACSEC_RXSC_ATTR_PAD)) {
23572408
nla_nest_cancel(skb, rxsc_nest);
23582409
nla_nest_cancel(skb, rxsc_list);
23592410
goto nla_put_failure;
@@ -2413,7 +2464,9 @@ static int dump_secy(struct macsec_secy *secy, struct net_device *dev,
24132464

24142465
if (nla_put_u8(skb, MACSEC_SA_ATTR_AN, i) ||
24152466
nla_put_u32(skb, MACSEC_SA_ATTR_PN, rx_sa->next_pn) ||
2416-
nla_put_u64(skb, MACSEC_SA_ATTR_KEYID, rx_sa->key.id) ||
2467+
nla_put_u64_64bit(skb, MACSEC_SA_ATTR_KEYID,
2468+
rx_sa->key.id,
2469+
MACSEC_SA_ATTR_PAD) ||
24172470
nla_put_u8(skb, MACSEC_SA_ATTR_ACTIVE, rx_sa->active)) {
24182471
nla_nest_cancel(skb, rxsa_nest);
24192472
nla_nest_cancel(skb, rxsc_nest);
@@ -3145,9 +3198,9 @@ static struct net *macsec_get_link_net(const struct net_device *dev)
31453198
static size_t macsec_get_size(const struct net_device *dev)
31463199
{
31473200
return 0 +
3148-
nla_total_size(8) + /* SCI */
3201+
nla_total_size_64bit(8) + /* SCI */
31493202
nla_total_size(1) + /* ICV_LEN */
3150-
nla_total_size(8) + /* CIPHER_SUITE */
3203+
nla_total_size_64bit(8) + /* CIPHER_SUITE */
31513204
nla_total_size(4) + /* WINDOW */
31523205
nla_total_size(1) + /* ENCODING_SA */
31533206
nla_total_size(1) + /* ENCRYPT */
@@ -3166,9 +3219,11 @@ static int macsec_fill_info(struct sk_buff *skb,
31663219
struct macsec_secy *secy = &macsec_priv(dev)->secy;
31673220
struct macsec_tx_sc *tx_sc = &secy->tx_sc;
31683221

3169-
if (nla_put_sci(skb, IFLA_MACSEC_SCI, secy->sci) ||
3222+
if (nla_put_sci(skb, IFLA_MACSEC_SCI, secy->sci,
3223+
IFLA_MACSEC_PAD) ||
31703224
nla_put_u8(skb, IFLA_MACSEC_ICV_LEN, secy->icv_len) ||
3171-
nla_put_u64(skb, IFLA_MACSEC_CIPHER_SUITE, DEFAULT_CIPHER_ID) ||
3225+
nla_put_u64_64bit(skb, IFLA_MACSEC_CIPHER_SUITE,
3226+
DEFAULT_CIPHER_ID, IFLA_MACSEC_PAD) ||
31723227
nla_put_u8(skb, IFLA_MACSEC_ENCODING_SA, tx_sc->encoding_sa) ||
31733228
nla_put_u8(skb, IFLA_MACSEC_ENCRYPT, tx_sc->encrypt) ||
31743229
nla_put_u8(skb, IFLA_MACSEC_PROTECT, secy->protect_frames) ||

‎drivers/net/wireless/mac80211_hwsim.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1030,7 +1030,7 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw,
10301030
data->pending_cookie++;
10311031
cookie = data->pending_cookie;
10321032
info->rate_driver_data[0] = (void *)cookie;
1033-
if (nla_put_u64(skb, HWSIM_ATTR_COOKIE, cookie))
1033+
if (nla_put_u64_64bit(skb, HWSIM_ATTR_COOKIE, cookie, HWSIM_ATTR_PAD))
10341034
goto nla_put_failure;
10351035

10361036
genlmsg_end(skb, msg_head);

‎drivers/net/wireless/mac80211_hwsim.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ enum {
148148
HWSIM_ATTR_RADIO_NAME,
149149
HWSIM_ATTR_NO_VIF,
150150
HWSIM_ATTR_FREQ,
151+
HWSIM_ATTR_PAD,
151152
__HWSIM_ATTR_MAX,
152153
};
153154
#define HWSIM_ATTR_MAX (__HWSIM_ATTR_MAX - 1)

‎fs/quota/netlink.c‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
4747
void *msg_head;
4848
int ret;
4949
int msg_size = 4 * nla_total_size(sizeof(u32)) +
50-
2 * nla_total_size(sizeof(u64));
50+
2 * nla_total_size_64bit(sizeof(u64));
5151

5252
/* We have to allocate using GFP_NOFS as we are called from a
5353
* filesystem performing write and thus further recursion into
@@ -68,8 +68,9 @@ void quota_send_warning(struct kqid qid, dev_t dev,
6868
ret = nla_put_u32(skb, QUOTA_NL_A_QTYPE, qid.type);
6969
if (ret)
7070
goto attr_err_out;
71-
ret = nla_put_u64(skb, QUOTA_NL_A_EXCESS_ID,
72-
from_kqid_munged(&init_user_ns, qid));
71+
ret = nla_put_u64_64bit(skb, QUOTA_NL_A_EXCESS_ID,
72+
from_kqid_munged(&init_user_ns, qid),
73+
QUOTA_NL_A_PAD);
7374
if (ret)
7475
goto attr_err_out;
7576
ret = nla_put_u32(skb, QUOTA_NL_A_WARNING, warntype);
@@ -81,8 +82,9 @@ void quota_send_warning(struct kqid qid, dev_t dev,
8182
ret = nla_put_u32(skb, QUOTA_NL_A_DEV_MINOR, MINOR(dev));
8283
if (ret)
8384
goto attr_err_out;
84-
ret = nla_put_u64(skb, QUOTA_NL_A_CAUSED_ID,
85-
from_kuid_munged(&init_user_ns, current_uid()));
85+
ret = nla_put_u64_64bit(skb, QUOTA_NL_A_CAUSED_ID,
86+
from_kuid_munged(&init_user_ns, current_uid()),
87+
QUOTA_NL_A_PAD);
8688
if (ret)
8789
goto attr_err_out;
8890
genlmsg_end(skb, msg_head);

‎include/net/gen_stats.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,19 @@ struct gnet_dump {
1919
/* Backward compatibility */
2020
int compat_tc_stats;
2121
int compat_xstats;
22+
int padattr;
2223
void * xstats;
2324
int xstats_len;
2425
struct tc_stats tc_stats;
2526
};
2627

2728
int gnet_stats_start_copy(struct sk_buff *skb, int type, spinlock_t *lock,
28-
struct gnet_dump *d);
29+
struct gnet_dump *d, int padattr);
2930

3031
int gnet_stats_start_copy_compat(struct sk_buff *skb, int type,
3132
int tc_stats_type, int xstats_type,
32-
spinlock_t *lock, struct gnet_dump *d);
33+
spinlock_t *lock, struct gnet_dump *d,
34+
int padattr);
3335

3436
int gnet_stats_copy_basic(struct gnet_dump *d,
3537
struct gnet_stats_basic_cpu __percpu *cpu,

‎include/uapi/linux/gen_stats.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ enum {
1010
TCA_STATS_QUEUE,
1111
TCA_STATS_APP,
1212
TCA_STATS_RATE_EST64,
13+
TCA_STATS_PAD,
1314
__TCA_STATS_MAX,
1415
};
1516
#define TCA_STATS_MAX (__TCA_STATS_MAX - 1)

‎include/uapi/linux/if_link.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,7 @@ enum {
434434
IFLA_MACSEC_SCB,
435435
IFLA_MACSEC_REPLAY_PROTECT,
436436
IFLA_MACSEC_VALIDATION,
437+
IFLA_MACSEC_PAD,
437438
__IFLA_MACSEC_MAX,
438439
};
439440

‎include/uapi/linux/if_macsec.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ enum macsec_secy_attrs {
5555
MACSEC_SECY_ATTR_INC_SCI,
5656
MACSEC_SECY_ATTR_ES,
5757
MACSEC_SECY_ATTR_SCB,
58+
MACSEC_SECY_ATTR_PAD,
5859
__MACSEC_SECY_ATTR_END,
5960
NUM_MACSEC_SECY_ATTR = __MACSEC_SECY_ATTR_END,
6061
MACSEC_SECY_ATTR_MAX = __MACSEC_SECY_ATTR_END - 1,
@@ -66,6 +67,7 @@ enum macsec_rxsc_attrs {
6667
MACSEC_RXSC_ATTR_ACTIVE, /* config/dump, u8 0..1 */
6768
MACSEC_RXSC_ATTR_SA_LIST, /* dump, nested */
6869
MACSEC_RXSC_ATTR_STATS, /* dump, nested, macsec_rxsc_stats_attr */
70+
MACSEC_RXSC_ATTR_PAD,
6971
__MACSEC_RXSC_ATTR_END,
7072
NUM_MACSEC_RXSC_ATTR = __MACSEC_RXSC_ATTR_END,
7173
MACSEC_RXSC_ATTR_MAX = __MACSEC_RXSC_ATTR_END - 1,
@@ -79,6 +81,7 @@ enum macsec_sa_attrs {
7981
MACSEC_SA_ATTR_KEY, /* config, data */
8082
MACSEC_SA_ATTR_KEYID, /* config/dump, u64 */
8183
MACSEC_SA_ATTR_STATS, /* dump, nested, macsec_sa_stats_attr */
84+
MACSEC_SA_ATTR_PAD,
8285
__MACSEC_SA_ATTR_END,
8386
NUM_MACSEC_SA_ATTR = __MACSEC_SA_ATTR_END,
8487
MACSEC_SA_ATTR_MAX = __MACSEC_SA_ATTR_END - 1,
@@ -110,6 +113,7 @@ enum macsec_rxsc_stats_attr {
110113
MACSEC_RXSC_STATS_ATTR_IN_PKTS_NOT_VALID,
111114
MACSEC_RXSC_STATS_ATTR_IN_PKTS_NOT_USING_SA,
112115
MACSEC_RXSC_STATS_ATTR_IN_PKTS_UNUSED_SA,
116+
MACSEC_RXSC_STATS_ATTR_PAD,
113117
__MACSEC_RXSC_STATS_ATTR_END,
114118
NUM_MACSEC_RXSC_STATS_ATTR = __MACSEC_RXSC_STATS_ATTR_END,
115119
MACSEC_RXSC_STATS_ATTR_MAX = __MACSEC_RXSC_STATS_ATTR_END - 1,
@@ -137,6 +141,7 @@ enum macsec_txsc_stats_attr {
137141
MACSEC_TXSC_STATS_ATTR_OUT_PKTS_ENCRYPTED,
138142
MACSEC_TXSC_STATS_ATTR_OUT_OCTETS_PROTECTED,
139143
MACSEC_TXSC_STATS_ATTR_OUT_OCTETS_ENCRYPTED,
144+
MACSEC_TXSC_STATS_ATTR_PAD,
140145
__MACSEC_TXSC_STATS_ATTR_END,
141146
NUM_MACSEC_TXSC_STATS_ATTR = __MACSEC_TXSC_STATS_ATTR_END,
142147
MACSEC_TXSC_STATS_ATTR_MAX = __MACSEC_TXSC_STATS_ATTR_END - 1,
@@ -153,6 +158,7 @@ enum macsec_secy_stats_attr {
153158
MACSEC_SECY_STATS_ATTR_IN_PKTS_UNKNOWN_SCI,
154159
MACSEC_SECY_STATS_ATTR_IN_PKTS_NO_SCI,
155160
MACSEC_SECY_STATS_ATTR_IN_PKTS_OVERRUN,
161+
MACSEC_SECY_STATS_ATTR_PAD,
156162
__MACSEC_SECY_STATS_ATTR_END,
157163
NUM_MACSEC_SECY_STATS_ATTR = __MACSEC_SECY_STATS_ATTR_END,
158164
MACSEC_SECY_STATS_ATTR_MAX = __MACSEC_SECY_STATS_ATTR_END - 1,

‎include/uapi/linux/inet_diag.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,11 @@ enum {
115115
INET_DIAG_SKV6ONLY,
116116
INET_DIAG_LOCALS,
117117
INET_DIAG_PEERS,
118+
INET_DIAG_PAD,
119+
__INET_DIAG_MAX,
118120
};
119121

120-
#define INET_DIAG_MAX INET_DIAG_SKV6ONLY
122+
#define INET_DIAG_MAX (__INET_DIAG_MAX - 1)
121123

122124
/* INET_DIAG_MEM */
123125

0 commit comments

Comments
 (0)