US makes deal with Iranian to swap prisoners