diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 18:55:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 18:55:09 -0400 |
| commit | 61b22e693ea33af02f3380d3dbed9ee65a80c729 (patch) | |
| tree | 4507ddcc055109e35a03820115abd7c09a5d0cdd /net/rose/rose_dev.c | |
| parent | 3a3bca5ace9123d1a6b890ceac2902ebf2b1fd50 (diff) | |
| parent | 24b8e05dc1b03c1f80828e642838511c16e17250 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/rose/rose_dev.c')
| -rw-r--r-- | net/rose/rose_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rose/rose_dev.c b/net/rose/rose_dev.c index a8ed9a1d09f9..d297af737d10 100644 --- a/net/rose/rose_dev.c +++ b/net/rose/rose_dev.c | |||
| @@ -149,6 +149,6 @@ void rose_setup(struct net_device *dev) | |||
| 149 | dev->set_mac_address = rose_set_mac_address; | 149 | dev->set_mac_address = rose_set_mac_address; |
| 150 | 150 | ||
| 151 | /* New-style flags. */ | 151 | /* New-style flags. */ |
| 152 | dev->flags = 0; | 152 | dev->flags = IFF_NOARP; |
| 153 | dev->get_stats = rose_get_stats; | 153 | dev->get_stats = rose_get_stats; |
| 154 | } | 154 | } |