|
 |
e293be |
centosplus patch [bug#15040]
|
|
|
e293be |
|
|
|
e293be |
Submitted-by h-masuda
|
|
|
e293be |
|
|
|
e293be |
--- a/drivers/net/ethernet/sun/niu.c 2018-11-15 09:07:13.000000000 -0800
|
|
|
e293be |
+++ b/drivers/net/ethernet/sun/niu.c 2018-12-16 16:32:19.423571926 -0800
|
|
|
e293be |
@@ -3492,7 +3492,7 @@ static int niu_process_rx_pkt(struct nap
|
|
|
e293be |
|
|
|
e293be |
rh = (struct rx_pkt_hdr1 *) skb->data;
|
|
|
e293be |
if (np->dev->features & NETIF_F_RXHASH)
|
|
|
e293be |
- skb->rxhash = ((u32)rh->hashval2_0 << 24 |
|
|
|
e293be |
+ skb->hash = ((u32)rh->hashval2_0 << 24 | /* XXX rename */
|
|
|
e293be |
(u32)rh->hashval2_1 << 16 |
|
|
|
e293be |
(u32)rh->hashval1_1 << 8 |
|
|
|
e293be |
(u32)rh->hashval1_2 << 0);
|
|
|
e293be |
@@ -6293,8 +6293,8 @@ no_rings:
|
|
|
e293be |
stats->tx_errors = errors;
|
|
|
e293be |
}
|
|
|
e293be |
|
|
|
e293be |
-static struct rtnl_link_stats64 *niu_get_stats(struct net_device *dev,
|
|
|
e293be |
- struct rtnl_link_stats64 *stats)
|
|
|
e293be |
+static /* struct rtnl_link_stats64 * */ void niu_get_stats(struct net_device *dev,
|
|
|
e293be |
+ struct rtnl_link_stats64 *stats) /* XXX RH_KABI_REPLACE in include/linux/netdevice.h */
|
|
|
e293be |
{
|
|
|
e293be |
struct niu *np = netdev_priv(dev);
|
|
|
e293be |
|
|
|
e293be |
@@ -6303,7 +6303,7 @@ static struct rtnl_link_stats64 *niu_get
|
|
|
e293be |
niu_get_tx_stats(np, stats);
|
|
|
e293be |
}
|
|
|
e293be |
|
|
|
e293be |
- return stats;
|
|
|
e293be |
+ /* return stats; */ /* XXX RH_KABI_REPLACE */
|
|
|
e293be |
}
|
|
|
e293be |
|
|
|
e293be |
static void niu_load_hash_xmac(struct niu *np, u16 *hash)
|
|
|
e293be |
@@ -9695,7 +9695,7 @@ static const struct net_device_ops niu_n
|
|
|
e293be |
.ndo_set_mac_address = niu_set_mac_addr,
|
|
|
e293be |
.ndo_do_ioctl = niu_ioctl,
|
|
|
e293be |
.ndo_tx_timeout = niu_tx_timeout,
|
|
|
e293be |
- .ndo_change_mtu = niu_change_mtu,
|
|
|
e293be |
+ .ndo_change_mtu_rh74 = niu_change_mtu, /* XXX RH_KABI_RENAME */
|
|
|
e293be |
};
|
|
|
e293be |
|
|
|
e293be |
static void niu_assign_netdev_ops(struct net_device *dev)
|