Samuka007 5 months ago
parent
commit
acd348572d

+ 1 - 1
kernel/src/driver/block/virtio_blk.rs

@@ -38,7 +38,7 @@ use crate::{
         },
     },
     exception::{irqdesc::IrqReturn, IrqNumber},
-    filesystem::{kernfs::KernFSInode, mbr::MbrDiskPartionTable, sysfs::AttributeGroup},
+    filesystem::{kernfs::KernFSInode, mbr::MbrDiskPartionTable},
     init::initcall::INITCALL_POSTCORE,
     libs::{
         rwlock::{RwLockReadGuard, RwLockWriteGuard},

+ 3 - 1
kernel/src/driver/net/loopback.rs

@@ -286,7 +286,9 @@ impl LoopbackInterface {
             smoltcp::iface::Interface::new(iface_config, &mut driver, Instant::now().into());
         //设置网卡地址为127.0.0.1
         iface.update_ip_addrs(|ip_addrs| {
-            ip_addrs.push(IpCidr::new(IpAddress::v4(127, 0, 0, 1), 8)).expect("Push ipCidr failed: full");
+            ip_addrs
+                .push(IpCidr::new(IpAddress::v4(127, 0, 0, 1), 8))
+                .expect("Push ipCidr failed: full");
         });
 
         Arc::new(LoopbackInterface {

+ 1 - 1
kernel/src/net/mod.rs

@@ -10,9 +10,9 @@ use crate::{driver::net::Iface, libs::rwlock::RwLock};
 
 pub mod event_poll;
 pub mod net_core;
+pub mod posix;
 pub mod socket;
 pub mod syscall;
-pub mod posix;
 
 lazy_static! {
     /// # 所有网络接口的列表

+ 2 - 2
kernel/src/net/posix.rs

@@ -1,6 +1,6 @@
-// 
+//
 // posix.rs 记录了系统调用时用到的结构
-// 
+//
 
 bitflags::bitflags! {
     // #[derive(PartialEq, Eq, Debug, Clone, Copy)]

+ 1 - 1
kernel/src/net/socket/base.rs

@@ -1,7 +1,7 @@
 #![allow(unused_variables)]
 
-use crate::net::socket::*;
 use crate::net::posix::MsgHdr;
+use crate::net::socket::*;
 use alloc::sync::Arc;
 use core::any::Any;
 use core::fmt::Debug;

+ 7 - 9
kernel/src/net/socket/inet/syscall.rs

@@ -14,16 +14,14 @@ fn create_inet_socket(
     // log::debug!("type: {:?}, protocol: {:?}", socket_type, protocol);
     use smoltcp::wire::IpProtocol::*;
     match socket_type {
-        PSOCK::Datagram => {
-            match protocol {
-                HopByHop | Udp => {
-                    return Ok(UdpSocket::new(false));
-                }
-                _ => {
-                    return Err(EPROTONOSUPPORT);
-                }
+        PSOCK::Datagram => match protocol {
+            HopByHop | Udp => {
+                return Ok(UdpSocket::new(false));
             }
-        }
+            _ => {
+                return Err(EPROTONOSUPPORT);
+            }
+        },
         PSOCK::Stream => match protocol {
             HopByHop | Tcp => {
                 return Ok(TcpSocket::new(false));