diff options
| author | David S. Miller <davem@davemloft.net> | 2012-03-09 17:34:20 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-09 17:34:20 -0500 |
| commit | b2d3298e0916fa059712691c85a0e97becc4ab9f (patch) | |
| tree | c7d5ea46a9dbf9cebdb122df4aaf0beda6e7621e /drivers/net/caif | |
| parent | 1a0bdadb4e36abac63b0a9787f372aac30c11a9e (diff) | |
| parent | a7f4255f906f60f72e00aad2fb000939449ff32e (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/caif')
| -rw-r--r-- | drivers/net/caif/caif_hsi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c index c8afd62239e9..9a66e2a910ae 100644 --- a/drivers/net/caif/caif_hsi.c +++ b/drivers/net/caif/caif_hsi.c | |||
| @@ -1031,7 +1031,7 @@ static void cfhsi_setup(struct net_device *dev) | |||
| 1031 | dev->netdev_ops = &cfhsi_ops; | 1031 | dev->netdev_ops = &cfhsi_ops; |
| 1032 | dev->type = ARPHRD_CAIF; | 1032 | dev->type = ARPHRD_CAIF; |
| 1033 | dev->flags = IFF_POINTOPOINT | IFF_NOARP; | 1033 | dev->flags = IFF_POINTOPOINT | IFF_NOARP; |
| 1034 | dev->mtu = CFHSI_MAX_PAYLOAD_SZ; | 1034 | dev->mtu = CFHSI_MAX_CAIF_FRAME_SZ; |
| 1035 | dev->tx_queue_len = 0; | 1035 | dev->tx_queue_len = 0; |
| 1036 | dev->destructor = free_netdev; | 1036 | dev->destructor = free_netdev; |
| 1037 | skb_queue_head_init(&cfhsi->qhead); | 1037 | skb_queue_head_init(&cfhsi->qhead); |