diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 15:55:09 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 15:55:09 -0700 |
commit | 61b22e693ea33af02f3380d3dbed9ee65a80c729 (patch) | |
tree | 4507ddcc055109e35a03820115abd7c09a5d0cdd /drivers/net/hamradio/scc.c | |
parent | 3a3bca5ace9123d1a6b890ceac2902ebf2b1fd50 (diff) | |
parent | 24b8e05dc1b03c1f80828e642838511c16e17250 (diff) | |
download | kernel_samsung_smdk4412-61b22e693ea33af02f3380d3dbed9ee65a80c729.zip kernel_samsung_smdk4412-61b22e693ea33af02f3380d3dbed9ee65a80c729.tar.gz kernel_samsung_smdk4412-61b22e693ea33af02f3380d3dbed9ee65a80c729.tar.bz2 |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/hamradio/scc.c')
-rw-r--r-- | drivers/net/hamradio/scc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c index c27e417..6ace0e9 100644 --- a/drivers/net/hamradio/scc.c +++ b/drivers/net/hamradio/scc.c @@ -1557,7 +1557,7 @@ static void scc_net_setup(struct net_device *dev) dev->stop = scc_net_close; dev->hard_start_xmit = scc_net_tx; - dev->hard_header = ax25_encapsulate; + dev->hard_header = ax25_hard_header; dev->rebuild_header = ax25_rebuild_header; dev->set_mac_address = scc_net_set_mac_address; dev->get_stats = scc_net_get_stats; |