diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-11-01 10:32:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-11-01 10:32:43 -0700 |
| commit | 23c161ee2c220f3791cfd452f38b516f0d3ffaa8 (patch) | |
| tree | c3ba126a35c3ac10579e7a6ff9b990526448ce51 /include | |
| parent | hp100: Move 100BaseVG AnyLAN driver to staging (diff) | |
| parent | net: bridge: fdb: restore unlikely() when taking over externally added entries (diff) | |
| download | linux-dev-23c161ee2c220f3791cfd452f38b516f0d3ffaa8.tar.xz linux-dev-23c161ee2c220f3791cfd452f38b516f0d3ffaa8.zip | |
Merge branch 'net-bridge-minor-followup-optimizations'
Nikolay Aleksandrov says:
====================
net: bridge: minor followup optimizations
After the converted flags to bitops we can take advantage of the flags
assignment and remove one test and three atomic bitops from the learning
paths (patch 01 and patch 02), patch 03 restores the unlikely() when taking
over HW learned entries.
v2: a clean export of the latest set version
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/trace/events/bridge.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/trace/events/bridge.h b/include/trace/events/bridge.h index 8ea966448b58..6b200059c2c5 100644 --- a/include/trace/events/bridge.h +++ b/include/trace/events/bridge.h @@ -95,16 +95,16 @@ TRACE_EVENT(fdb_delete, TRACE_EVENT(br_fdb_update, TP_PROTO(struct net_bridge *br, struct net_bridge_port *source, - const unsigned char *addr, u16 vid, bool added_by_user), + const unsigned char *addr, u16 vid, unsigned long flags), - TP_ARGS(br, source, addr, vid, added_by_user), + TP_ARGS(br, source, addr, vid, flags), TP_STRUCT__entry( __string(br_dev, br->dev->name) __string(dev, source->dev->name) __array(unsigned char, addr, ETH_ALEN) __field(u16, vid) - __field(bool, added_by_user) + __field(unsigned long, flags) ), TP_fast_assign( @@ -112,14 +112,14 @@ TRACE_EVENT(br_fdb_update, __assign_str(dev, source->dev->name); memcpy(__entry->addr, addr, ETH_ALEN); __entry->vid = vid; - __entry->added_by_user = added_by_user; + __entry->flags = flags; ), - TP_printk("br_dev %s source %s addr %02x:%02x:%02x:%02x:%02x:%02x vid %u added_by_user %d", + TP_printk("br_dev %s source %s addr %02x:%02x:%02x:%02x:%02x:%02x vid %u flags 0x%lx", __get_str(br_dev), __get_str(dev), __entry->addr[0], __entry->addr[1], __entry->addr[2], __entry->addr[3], __entry->addr[4], __entry->addr[5], __entry->vid, - __entry->added_by_user) + __entry->flags) ); |