diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
| commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
| tree | db28291df94a2043af2123911984c5c173da4e6f /drivers/net/tokenring/ibmtr.c | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/net/tokenring/ibmtr.c')
| -rw-r--r-- | drivers/net/tokenring/ibmtr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c index e257a00fe14b..b5c8c18f5046 100644 --- a/drivers/net/tokenring/ibmtr.c +++ b/drivers/net/tokenring/ibmtr.c | |||
| @@ -823,7 +823,7 @@ static const struct net_device_ops trdev_netdev_ops = { | |||
| 823 | .ndo_open = tok_open, | 823 | .ndo_open = tok_open, |
| 824 | .ndo_stop = tok_close, | 824 | .ndo_stop = tok_close, |
| 825 | .ndo_start_xmit = tok_send_packet, | 825 | .ndo_start_xmit = tok_send_packet, |
| 826 | .ndo_set_multicast_list = tok_set_multicast_list, | 826 | .ndo_set_rx_mode = tok_set_multicast_list, |
| 827 | .ndo_change_mtu = ibmtr_change_mtu, | 827 | .ndo_change_mtu = ibmtr_change_mtu, |
| 828 | }; | 828 | }; |
| 829 | 829 | ||