Commit 48f5d5cb authored by David S. Miller's avatar David S. Miller

Merge tag 'ieee802154-for-davem-2020-03-13' of...

Merge tag 'ieee802154-for-davem-2020-03-13' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan-next

Stefan Schmidt says:

====================
pull-request: ieee802154-next 2020-03-13

An update from ieee802154 for *net-next*

Two small patches with updates targeting the whole tree.
Sergin does update SPI drivers to the new transfer delay handling
and Gustavo did one of his zero-length array replacement patches.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5ec82c49 53cb2cfa
...@@ -946,7 +946,8 @@ static int ca8210_spi_transfer( ...@@ -946,7 +946,8 @@ static int ca8210_spi_transfer(
cas_ctl->transfer.bits_per_word = 0; /* Use device setting */ cas_ctl->transfer.bits_per_word = 0; /* Use device setting */
cas_ctl->transfer.tx_buf = cas_ctl->tx_buf; cas_ctl->transfer.tx_buf = cas_ctl->tx_buf;
cas_ctl->transfer.rx_buf = cas_ctl->tx_in_buf; cas_ctl->transfer.rx_buf = cas_ctl->tx_in_buf;
cas_ctl->transfer.delay_usecs = 0; cas_ctl->transfer.delay.value = 0;
cas_ctl->transfer.delay.unit = SPI_DELAY_UNIT_USECS;
cas_ctl->transfer.cs_change = 0; cas_ctl->transfer.cs_change = 0;
cas_ctl->transfer.len = sizeof(struct mac_message); cas_ctl->transfer.len = sizeof(struct mac_message);
cas_ctl->msg.complete = ca8210_spi_transfer_complete; cas_ctl->msg.complete = ca8210_spi_transfer_complete;
......
...@@ -214,7 +214,7 @@ struct wpan_phy { ...@@ -214,7 +214,7 @@ struct wpan_phy {
/* the network namespace this phy lives in currently */ /* the network namespace this phy lives in currently */
possible_net_t _net; possible_net_t _net;
char priv[0] __aligned(NETDEV_ALIGN); char priv[] __aligned(NETDEV_ALIGN);
}; };
static inline struct net *wpan_phy_net(struct wpan_phy *wpan_phy) static inline struct net *wpan_phy_net(struct wpan_phy *wpan_phy)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment