aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/linux/mlx4/device.h2
-rw-r--r--include/uapi/linux/ethtool.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index b2f8ab9a57c4..37e4404d0227 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -583,7 +583,7 @@ struct mlx4_uar {
583}; 583};
584 584
585struct mlx4_bf { 585struct mlx4_bf {
586 unsigned long offset; 586 unsigned int offset;
587 int buf_size; 587 int buf_size;
588 struct mlx4_uar *uar; 588 struct mlx4_uar *uar;
589 void __iomem *reg; 589 void __iomem *reg;
diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h
index 7a364f2f3d3f..99b43056a6fe 100644
--- a/include/uapi/linux/ethtool.h
+++ b/include/uapi/linux/ethtool.h
@@ -212,6 +212,7 @@ struct ethtool_value {
212enum tunable_id { 212enum tunable_id {
213 ETHTOOL_ID_UNSPEC, 213 ETHTOOL_ID_UNSPEC,
214 ETHTOOL_RX_COPYBREAK, 214 ETHTOOL_RX_COPYBREAK,
215 ETHTOOL_TX_COPYBREAK,
215}; 216};
216 217
217enum tunable_type_id { 218enum tunable_type_id {