diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-11-02 23:56:40 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-11-02 23:56:40 -0400 |
| commit | 31cbecb4ab538f433145bc5a46f3bea9b9627031 (patch) | |
| tree | d6206d42dea7298f7ef05fd1f7bf474245f0d43a /net/atm | |
| parent | 2b72c9ccd22c4a3299e5a358dcd639fb253730f4 (diff) | |
| parent | 278c023a99b0d6b471d0f4a79835c703482e29ac (diff) | |
Merge branch 'osd-devel' into nfs-for-next
Diffstat (limited to 'net/atm')
| -rw-r--r-- | net/atm/lec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/atm/lec.c b/net/atm/lec.c index 215c9fad7cdf..f1964caa0f83 100644 --- a/net/atm/lec.c +++ b/net/atm/lec.c | |||
| @@ -643,7 +643,7 @@ static const struct net_device_ops lec_netdev_ops = { | |||
| 643 | .ndo_start_xmit = lec_start_xmit, | 643 | .ndo_start_xmit = lec_start_xmit, |
| 644 | .ndo_change_mtu = lec_change_mtu, | 644 | .ndo_change_mtu = lec_change_mtu, |
| 645 | .ndo_tx_timeout = lec_tx_timeout, | 645 | .ndo_tx_timeout = lec_tx_timeout, |
| 646 | .ndo_set_multicast_list = lec_set_multicast_list, | 646 | .ndo_set_rx_mode = lec_set_multicast_list, |
| 647 | }; | 647 | }; |
| 648 | 648 | ||
| 649 | static const unsigned char lec_ctrl_magic[] = { | 649 | static const unsigned char lec_ctrl_magic[] = { |