diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/if_ether.h | 3 | ||||
-rw-r--r-- | include/linux/skbuff.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h index e157c1399b61..42dc6a3571ec 100644 --- a/include/linux/if_ether.h +++ b/include/linux/if_ether.h | |||
@@ -129,8 +129,7 @@ extern ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len); | |||
129 | /* | 129 | /* |
130 | * Display a 6 byte device address (MAC) in a readable format. | 130 | * Display a 6 byte device address (MAC) in a readable format. |
131 | */ | 131 | */ |
132 | extern char *print_mac(char *buf, const unsigned char *addr); | 132 | extern __pure char *print_mac(char *buf, const unsigned char *addr); |
133 | #define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x" | ||
134 | #define MAC_BUF_SIZE 18 | 133 | #define MAC_BUF_SIZE 18 |
135 | #define DECLARE_MAC_BUF(var) char var[MAC_BUF_SIZE] __maybe_unused | 134 | #define DECLARE_MAC_BUF(var) char var[MAC_BUF_SIZE] __maybe_unused |
136 | 135 | ||
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 412672a79e8a..bbd8d0027e2f 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
@@ -232,6 +232,8 @@ typedef unsigned char *sk_buff_data_t; | |||
232 | * @mark: Generic packet mark | 232 | * @mark: Generic packet mark |
233 | * @nfct: Associated connection, if any | 233 | * @nfct: Associated connection, if any |
234 | * @ipvs_property: skbuff is owned by ipvs | 234 | * @ipvs_property: skbuff is owned by ipvs |
235 | * @peeked: this packet has been seen already, so stats have been | ||
236 | * done for it, don't do them again | ||
235 | * @nf_trace: netfilter packet trace flag | 237 | * @nf_trace: netfilter packet trace flag |
236 | * @nfctinfo: Relationship of this skb to the connection | 238 | * @nfctinfo: Relationship of this skb to the connection |
237 | * @nfct_reasm: netfilter conntrack re-assembly pointer | 239 | * @nfct_reasm: netfilter conntrack re-assembly pointer |