summaryrefslogtreecommitdiff
path: root/net/rose/rose_dev.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-12 15:55:09 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-12 15:55:09 -0700
commit61b22e693ea33af02f3380d3dbed9ee65a80c729 (patch)
tree4507ddcc055109e35a03820115abd7c09a5d0cdd /net/rose/rose_dev.c
parent3a3bca5ace9123d1a6b890ceac2902ebf2b1fd50 (diff)
parent24b8e05dc1b03c1f80828e642838511c16e17250 (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.c2
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)
dev->set_mac_address = rose_set_mac_address;
/* New-style flags. */
- dev->flags = 0;
+ dev->flags = IFF_NOARP;
dev->get_stats = rose_get_stats;
}