add kernel::net::device::feature::NetIf

Signed-off-by: Finn Behrens <[email protected]>

Author: kloenk

drivers/net/dummy_rs.rs

@@ -1,6 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0
 
 //! Rust dummy network driver
+//! 
+//! This is a demonstration of what a small driver looks like in Rust, based on drivers/net/dummy.c.
+//! This code is provided as a demonstration only, not as a proposal to mass-rewrite existing drivers in Rust
+
+// TODO: copyright (see ./dummy.c)
+
 
 #![no_std]
 #![feature(allocator_api, global_asm)]
@@ -32,11 +38,26 @@ fn setup(dev: &mut NetDevice<DummyRsDev>) {
     dev.remove_flag(device::Iff::MULTICAST);
 
     dev.add_private_flag(device::IffPriv::LIVE_ADDR_CHANGE);
-    dev.add_private_flag(device::IffPriv::IFF_NO_QUEUE);
-
-    dev.add_feature(device::Feature::NETIF_F_SG);
-    dev.add_feature(device::Feature::NETIF_F_FRAGLIST_BIT);
-    dev.add_feature(device::Feature::NETIF_F_GSO_SOFTWARE);
+    dev.add_private_flag(device::IffPriv::NO_QUEUE);
+
+    let mut feature = device::feature::NetIF::new();
+
+    //feature.add(device::feature::NETIF_F_SG);
+    //feature.add(device::feature::NETIF_F_FRAGLIST_BIT as u64);
+    feature += device::feature::NETIF_F_SG;
+    feature += device::feature::NETIF_F_FRAGLIST;
+    feature += device::feature::NETIF_F_GSO_SOFTWARE;
+    feature += device::feature::NETIF_F_HW_CSUM;
+    feature += device::feature::NETIF_F_HIGHDMA;
+    feature += device::feature::NETIF_F_LLTX;
+    feature += device::feature::NETIF_F_GSO_ENCAP_ALL;
+
+    dev.set_features(feature);
+    dev.set_hw_features(feature);
+    dev.set_hw_enc_features(feature);
+
+    dev.hw_addr_random();
+    dev.set_mtu(0, 0);
 }
 
 rtnl_link_ops! {

rust/generate_rust_analyzer.sh

@@ -5,6 +5,9 @@ objtree=$2
 lib_src=$3
 bindgen_file=$4
 
+dylib_and_extra=',"proc_macro_dylib_path":"./rust/libmodule.so","env":{"RUST_BINDINGS_FILE":"'$bindgen_file'"},
+        "source": { "include_dirs": ["'${objtree}'/rust/"], "exclude_dirs": []}'
+
 # TODO: create issue at RA to accept @arg file
 function generate_cfgs() {
     echo '['
@@ -19,7 +22,7 @@ function generate_crate() {
     member=${3:-"true"}
     cfg=${4:-$(generate_cfgs)}
     deps=${5:-'[{"crate":0,"name":"core"},{"crate":2,"name":"alloc"},{"crate":3,"name":"kernel"}]'}
-    extra=${6:-""}
+    extra=${EXTRA:-""}
 
     echo "{
         \"display_name\":\"$name\",
@@ -40,10 +43,8 @@ function generate_kernel() {
     generate_crate "alloc" "${lib_src}/alloc/src/lib.rs" "false" "[]" \
         '[{"crate":0,"name":"core"},{"crate":1,"name":"compiler_builtins"}]'
     echo ","
-    generate_crate "kernel" "${srctree}/rust/kernel/lib.rs" "true" "$(generate_cfgs)" \
-        '[{"crate":0,"name":"core"},{"crate":2,"name":"alloc"}]' \
-        ',"proc_macro_dylib_path":"./rust/libmodule.so","env":{"RUST_BINDINGS_FILE":"'$bindgen_file'"},
-        "source": { "include_dirs": ["'${objtree}'/rust/"], "exclude_dirs": []}'
+    EXTRA=$dylib_and_extra generate_crate "kernel" "${srctree}/rust/kernel/lib.rs" "true" "$(generate_cfgs)" \
+        '[{"crate":0,"name":"core"},{"crate":2,"name":"alloc"}]'
     echo ","
     echo '{
         "display_name":"module",
@@ -66,7 +67,7 @@ function check_and_generate() {
     echo "checking $filepath" >&2
     if grep -q $objname $makefile; then
         echo "building crate $name" >&2
-        echo $(generate_crate "$name" "$filepath")
+        echo $(EXTRA=$dylib_and_extra generate_crate "$name" "$filepath")
         echo ","
     fi
 }