diff options
| author | Mark Brown <broonie@kernel.org> | 2018-08-28 19:03:57 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-08-28 19:03:57 +0100 |
| commit | 6e2d6b2728fcb408eabd7991804f8cb33ff59f20 (patch) | |
| tree | 18dc3fc5bd55fa9ff92430e4ab8353de6c5c0e55 /include/linux/can | |
| parent | 6f0a256253f48095ba2e5bcdfbed41f21643c105 (diff) | |
| parent | 5b394b2ddf0347bef56e50c69a58773c94343ff3 (diff) | |
Merge tag 'v4.19-rc1' into asoc-4.19
Linux 4.19-rc1
Diffstat (limited to 'include/linux/can')
| -rw-r--r-- | include/linux/can/dev.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h index 055aaf5ed9af..a83e1f632eb7 100644 --- a/include/linux/can/dev.h +++ b/include/linux/can/dev.h @@ -143,7 +143,12 @@ u8 can_dlc2len(u8 can_dlc); /* map the sanitized data length to an appropriate data length code */ u8 can_len2dlc(u8 len); -struct net_device *alloc_candev(int sizeof_priv, unsigned int echo_skb_max); +struct net_device *alloc_candev_mqs(int sizeof_priv, unsigned int echo_skb_max, + unsigned int txqs, unsigned int rxqs); +#define alloc_candev(sizeof_priv, echo_skb_max) \ + alloc_candev_mqs(sizeof_priv, echo_skb_max, 1, 1) +#define alloc_candev_mq(sizeof_priv, echo_skb_max, count) \ + alloc_candev_mqs(sizeof_priv, echo_skb_max, count, count) void free_candev(struct net_device *dev); /* a candev safe wrapper around netdev_priv */ |