git-svn-id: https://spexeah.com:8443/svn/Asuro@738 6dbc8c32-bb84-406f-8558-d1cf31a0ab0c

src/driver/net/l3/arp.pas

@@ -197,15 +197,12 @@ begin
     copyIPv4(@Header^.Destination_Protocol[0], @AHeader.Destination_Protocol[0]);
     
     { Process ARP Packet }
-    Merge:= false;
     CacheElement:= findCacheRecordByIP(@AHeader.Source_Protocol[0]);
     if CacheElement = nil then CacheElement:= findCacheRecordByMAC(@AHeader.Source_Hardware[0]);
     if CacheElement <> nil then begin
         copyMAC(@AHeader.Source_Hardware[0], @CacheElement^.MAC[0]);
         copyIPv4(@AHeader.Source_Protocol[0], @CacheElement^.IP[0]);
-        Merge:= true;
     end else begin
-        if not Merge then begin
         CacheElement:= PARPCacheRecord(LL_Add(Cache));
         CopyMAC(@AHeader.Source_Hardware[0], @CacheElement^.MAC[0]);
         copyIPv4(@AHeader.Source_Protocol[0], @CacheElement^.IP[0]);
@@ -248,7 +245,6 @@ begin
             end;
         end;
     end;
-    end;
 end;
 
 procedure terminal_command_arp(Params : PParamList);

src/include/asuro.pas

@@ -9,14 +9,14 @@ const
      VERSION_SUB   = '1';
      REVISION      = '728';
      RELEASE       = 'ia';
-     LINE_COUNT    = 28529;
+     LINE_COUNT    = 28525;
      FILE_COUNT    = 90;
      DRIVER_COUNT  = 32;
      FPC_VERSION   = '2.6.4';
      NASM_VERSION  = '2.10.09';
      MAKE_VERSION  = '3.81';
      COMPILE_DATE  = '13/05/18';
-     COMPILE_TIME  = '12:06:37';
+     COMPILE_TIME  = '12:08:40';
  
 implementation